am b1db04f3: Merge "aidl: Add end to end test"

* commit 'b1db04f371963cb61bc5df21142a59f77515a62f':
  aidl: Add end to end test