Merge "Updating makefiles for hidl_interface." into oc-mr1-dev-plus-aosp