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

Change-Id: I717bca2bb50f94abef03f628c91b535b7cb7c267