Merge "Update HIDL makefiles"
am: c01ecb318a

Change-Id: I293e88f584ea6ec619924df07282683a958f58a8