Merge "Update HIDL makefiles"