Reconcile with jb-release

Change-Id: I439c76c3cae573c9dd875a329131e90ee6083717
tree: 6dd83fb3d738c3a4dc4530a16ac1c5038761d148
  1. java/
  2. res/
  3. tests/
  4. Android.mk