Merge changes Ic0b0d13f,Ib463a51d into qt-dev am: d70470ce3c am: d32721d7dd am: d1f18f4014 am: 18cca4b580

Original change: https://googleplex-android-review.googlesource.com/c/platform/platform_testing/+/16874419

Change-Id: Ife2ac373b83658f1ccd53bac929a2d6837864a74
tree: f19820b4f161aa23466042dcdc96df2450a16ece
  1. build/
  2. docs/
  3. emu_test/
  4. libraries/
  5. scripts/
  6. tests/
  7. utils/
  8. PREUPLOAD.cfg