Merge "Merge "Test script change for better reliability" am: 627603416e" into oc-dev
am: 99c4354b09

Change-Id: I0971bb0b51077fdfb455fc1adc39ae4b2f512261
tree: e68b6d84140a05491a418f16eb89b089916eec9b
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg