Merge "aidl: Pull main() into dedicated file"