am f9d07403: am f7ea7c7b: am 1643e97b: Merge "aidl: Pull main() into dedicated file"

* commit 'f9d0740352eff66fdb9a69f4313b0850a871dcd9':
  aidl: Pull main() into dedicated file