Merge changes I6c1ce353,Ifbc186e9,I054a6b55,I4ef58164,I7a90c661, ...

* changes:
  gn2bp: Fix output for protoc_wrapper.py
  gn2bp: Set --py-out-dir arg in protoc_wrapper.py
  gn2bp: Set --include arg in protoc_wrapper.py
  gn2bp: Fix dllexport_decl arg in protoc_wrapper.py
  gn2bp: Set --cc-out-dir arg for protoc_wrapper.py
  gn2bp: Set --proto-in-dir arg for protoc_wrapper.py
  gn2bp: Use aprotoc in protoc_wrapper.py
  gn2bp: Add protoc to builtin_deps
  gn2bp: Update not to change Android.bp.swp every run