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

Change-Id: Ia8af119bc9439269ad5bf06e147f97d65a099d2c