Merge "Update HIDL makefiles."