Merge "Update HIDL makefiles" am: c01ecb318a
am: bb21a0f555

Change-Id: I5f0394a33781e5d5663fbb37b12a937fe6895371