[DO NOT MERGE]
am: 1f5ef54b35  -s ours

Change-Id: I5a579b6cbe759cd389eaceb4964ae7a2ea1e42cc
tree: 91118339434f222ae8aab8165b77a082c4f89de9
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg