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

Change-Id: I8284ed74352c6212f43a6689f3fb27740d528157