Merge "Fixed NullPointerException" into qt-dev am: d4b94862b7
am: 7303e026f0

Change-Id: I8c503d759fa7ad82a0178549d3b8a0afa62074fc
tree: 0c7e16a3eb19f212f206af8a179443cd2d18b3eb
  1. build/
  2. common/
  3. tools/
  4. OWNERS
  5. PREUPLOAD.cfg
  6. test_defs.sh