Merge "`recovery` uses more shared libraries." am: 3c5e2c1c7e am: f8f53fd04c am: 14acf82585
am: 8ff5570ae5

Change-Id: Icf638b95ae67a9a1d69790232e60d789575818f8