Reconcile with jb-release

Change-Id: I55842c8ce980d1a5ea7bb4dcb3eb7d8dd4c9dbac
tree: ae2ff6dec5ff0e1f33cc2c13c0176a0b58b05936
  1. java/
  2. jni/