Merge "Update hidl makefiles for bpfmt"
am: ff0bd741ca

Change-Id: Icd0e90c12952f2471416986451cce7eebb6856af