Merge "Update HIDL makefiles." am: 49dad304a5
am: 68a25d22e3

Change-Id: I98400033b6e49696bc27930153a6747665235a98