Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ib4c90d47d0d64db2c116a47f026fb8a4c78461f9
tree: 7497efd94794c5c1cb47857dcf7a33b26f5fa34d
  1. androidtestlib/
  2. uiautomator/
  3. .gitignore
  4. Android.mk
  5. MODULE_LICENSE_APACHE2