Merge "Reserve 'libhidl' w/ convenient use." am: 54562d4342 am: e3d0d9fd66
am: f74c13de8c

Change-Id: Iabf3508e98af0b1b97c3760776995b32f5dd1f76