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

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