Build recovery variant of the dynamic linker am: 8d7866c58f
am: b9a021b628

Change-Id: I0599655a3d5b2e01183f4900b77f8cf086ee2d2c