Merge master@5406228 into git_qt-dev-plus-aosp.
am: 976d14e2aa

Change-Id: I84163963e6c08e6397f50109e7223ea423015f60
tree: 06a7e545e1cca1054c36927a3b9095788a3f9e3d
  1. darwin-x86/
  2. linux-x86/
  3. build-prebuilts.sh
  4. manifest.xml