Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master
am: 5c9e580f4f

Change-Id: Ia92390634bc67f3cffbe3a2644af52abee2bd07f