Merge "Add Java API for libvintf." into oc-dev