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

Change-Id: If65368d684d6240803806317213887b338bdb1a1
BUG: 129345239
tree: 4803b1f101c98bb6ffc31b40ff59c88e38ffb2fe
  1. darwin-x86/
  2. linux-x86/
  3. build-prebuilts.sh
  4. manifest.xml