Merge "Allow libhardware to be used in recovery" am: dc62b58d3d am: ced9903818 am: 93221cf4cd
am: acd90e7cfa

Change-Id: I250a74ffda8d23cf3586a40c70de763f08086fa1