Fix import path and clean up log messages. am: 8fb1219bf3
am: 71cdfc639e

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