Merge "Remove extra definition of AIDL" am: 77f411e116
am: b275dd1623

* commit 'b275dd1623ca5256d9dfb8542cd324c624c6e9fe':
  Remove extra definition of AIDL