Refactored for terminal/py3.4 use

Refactored import statements that were throwing import errors,
as well added consistency for import types.

Bug: None
Test: None
Change-Id: I1cf95abeda9a0a10df97013319416b80d8d28a32
13 files changed
tree: 8a17364414c5b81ae33046810b74f57f78a82dfc
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg