Merge "Update HIDL makefiles." into oc-mr1-dev am: 7dcc345b64  -s ours
am: 32cf03c18a  -s ours

Change-Id: I2555c4aa7719c175cb869c1d1a53d836932adb1f