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

Change-Id: I0a5c76c5d77d25b8846d1961a0f86a6bc6431f02