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

Change-Id: If5c034ff6a575a0249c301a4421b2ed256414374