Merge "Update HIDL makefiles." into oc-mr1-dev