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

Change-Id: I54b15a9cc81524612f11554385ec2e6db93ff2a6