Merge "Fixing bug for APM ON if device in bad shape"
am: 8151539ba8

Change-Id: I5bea383b24f9acdc31cdebee59fc01d16014f637
tree: 1b55785d29c7818b0327316f20795f4e59c84459
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg