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

Change-Id: Icc0cd55325130cfb669beae446fa59462e9a49b5