Merge "Fixing bugs for APM Data Test" am: 1c04b50114
am: 2c3b75eadb

Change-Id: I290ae074800063097ec72d2ef774b1cec65d2d0e
tree: 938920319b6acf6d9fda9e0377eed3c7162b15d4
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg