Snap for 7588338 from 67a3d73df071e72a39a9d872fd616b28c094a318 to sc-d1-release

Change-Id: I6a747f095ffaa85bce3008d30fb2d8796bd56ef0
diff --git a/aidl_to_java.cpp b/aidl_to_java.cpp
index 40b01d5..04888fd 100644
--- a/aidl_to_java.cpp
+++ b/aidl_to_java.cpp
@@ -731,11 +731,11 @@
        }},
       {"IBinder[]",
        [](const CodeGeneratorContext& c) {
-         c.writer << c.var << " = " << c.parcel << ".createBinderArray();\n";
+         c.writer << c.parcel << ".readBinderArray(" << c.var << ");\n";
        }},
       {"FileDescriptor[]",
        [](const CodeGeneratorContext& c) {
-         c.writer << c.var << " = " << c.parcel << ".createRawFileDescriptorArray();\n";
+         c.writer << c.parcel << ".readRawFileDescriptorArray(" << c.var << ");\n";
        }},
       {"ParcelFileDescriptor",
        [](const CodeGeneratorContext& c) {