Merge "Prevent multiple copies of android.hidl.manager-V1.0-java" into oc-dev