Merge "Update HIDL makefiles."
am: 5dd8752f09

Change-Id: I5a7273dd6e463173dddda891eadaa4693e2d426e