merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
tree: 76af9d62d0ae2ac5fc5d0e5459f1cb18e4ff5e0f
  1. androidtestlib/
  2. uiautomator/
  3. .gitignore
  4. Android.mk
  5. MODULE_LICENSE_APACHE2