am d214c7e4: am 5d76a3f2: Merge "add uiautomator into system image" into jb-dev

* commit 'd214c7e495f10f87d2834a3137c8c29512f7cfc5':
  add uiautomator into system image