[automerger skipped] Merge changes from topic "aidl-ndk-comparison" am: 370181de2d am: 44900ea50f am: 6a57433561 -s ours

am skip reason: Change-Id I3c112d0883c4d51fd5376709f3db4d72b6883697 with SHA-1 5001096eb6 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1519809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc6d583664b6f4cabacc9dba0822a01179550dca