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

Change-Id: If82faee4c5b98f1052751aa73a1d700281373ec9