Merge "Add a native aidl API." am: 577e3114da am: 4cfb3545d6
am: b17294db1c

Change-Id: I1628aaba2bb1b029fe8b7279bce6faff7503e982