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

Change-Id: I1d9c2c1d1b15f865890f3c11310abd4096497ff5