Merge "Merge "Test script change for better reliability" am: 627603416e" into oc-dev
tree: 0a410b600ef0c5bcd0d1c38c7415d44e1a5bad92
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg