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

Change-Id: I8e06523b6c536d95384d22bf54d220c46e2fb930