Merge pi-dr1-dev to aosp-master

Change-Id: I70927fd9f4c50d04fb72bb786ddec61f469d5c44
tree: 8bcb72b6d268b0fb83797146103effd16bc8435a
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg