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

Change-Id: I6edc5cac3a536a64f3ee5bff4de2392149735ee9