merge in oc-release history after reset to master
tree: 829e88892beaeafd01dac6c8ab8f48a2c685ca75
  1. java/
  2. tests/
  3. Android.mk
  4. build.gradle