Merge "Move tests from run_generated to individual tests" into oc-dev
am: 18951015fa

Change-Id: Ic20a38bc9e682a5bb40ec516d2428c3696aed6e1
tree: 78e01af9e6e44ffab667562a0aa66c910f4f5eec
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg