Merge "Fix typo in scripts" am: cb5b2a062e
am: 494e1ce9d2

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