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

Change-Id: Ic89a521342d386c9c3caad2766dd95f201c855be