[automerger skipped] Merge "Add a native aidl API." am: 577e3114da am: 4cfb3545d6 am: b17294db1c
am: fc827db988 -s ours
am skip reason: change_id Ic46cc34b4c1dd4ebc6bcc996fb3f8503607214ac with SHA1 874883536a is in history

Change-Id: I9c9ad0e93f68e164e6da2c1eecf8354f8e4ea21c