Merge "Update hidl makefiles for bpfmt" into qt-dev-plus-aosp