Merge master@5433138 into git_qt-dev-plus-aosp.
am: c5de062fad

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