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

Change-Id: Ie133ccc61dbfceee0183dfa4d656b01e3abec39d