Merge 4390ab42d33057cd9cd8332514487a9981d8b7b9 on remote branch

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