DO NOT MERGE Fixed bug with setup uninstall deleting acts source am: 72f870d782
am: 570195a4d9

Change-Id: Ifdc78d1392c30ab303c818a79d812c047c0ff593
tree: cc1541a3213240d866ab9a37daf955f540d15767
  1. acts/
  2. Android.mk