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

Change-Id: If4070036031ba754c2686ff6dc6d52f7cebd4044