Merge "Update HIDL makefiles." am: 5dd8752f09
am: b8d4a6ce31

Change-Id: Ic0b344af7259c253917a896ba14f5c5f956de561