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

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