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

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

diff --cc tools/aidl/AST.h
Simple merge

diff --cc tools/aidl/Type.h
Simple merge

diff --cc tools/aidl/aidl.cpp
Simple merge

diff --cc tools/aidl/generate_java.h
Simple merge

diff --cc tools/aidl/options.h
Simple merge

diff --cc tools/aidl/search_path.h
Simple merge