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

* commit '082fb1d8cb70952cda4d5ee1e79af3ee4572271a':
  aidl: Stop using Bionic's test main