Merge master@5433138 into git_qt-dev-plus-aosp.

Change-Id: If7b0f48325d4a0ff5d6f00cdfd113b040e56b29a
BUG: 129345239
tree: bdae98af8ba763282dbc72a00d5029490ca6e67f
  1. x86_64/
  2. Android.bp
  3. OWNERS
  4. rebuild.sh
  5. rebuild_gce.sh