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

Change-Id: I9bd0ca40222f8d5549cc9da82e124318c6ceb42e