Merge "Update hidl makefiles for bpfmt"