am 96343073: am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main"

* commit '96343073d63c72afa75057129abea4f0d4f8c103':
  aidl: Stop using Bionic's test main