Merge "Updating makefiles for hidl_interface." into oc-mr1-dev-plus-aosp
am: e803ecf89a  -s ours

Change-Id: Icfc1c42ddcdb343b54b396160305f7029c782af8