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

* commit 'dd80a6cf37799b41ae07c60137d312c5ea2db961':
  aidl: Stop using Bionic's test main