Merge "`recovery` uses more shared libraries." am: 3c5e2c1c7e
am: f8f53fd04c

Change-Id: Ibf374ac95558eecf13e7aeca8f86b4f285e806e0