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

Change-Id: I6bb54c4a0e4d2380b327523d947244e529b374a1