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