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

* commit '80a679c459d509e31f0f4e1b8accc327a451e0f5':
  aidl: Add end to end test