Merge changes from topic "ndk-aidl-parcelable-array" am: d38a30a6f9 am: 638282c8c8
am: c23b16a97a

Change-Id: I2b4861efc14064aebd35cda6707f2585598a9541