Merge changes Iff578b04,I019a186f
am: fbe285e27a

Change-Id: Ia609d48d2723a198d57e2747d0e27edf475e53b0
tree: 651210f0758763d4bc728744ad7586a31fcef09f
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg