[automerger skipped] Make recovery libraries shared / recovery_available am: c936a69619 am: 3e8262d633
am: c11cd3ccb8  -s ours

Change-Id: I97b51ee4a8962814c52f65d0c6bd16947193f191