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

Change-Id: I3abd9d8d28ca7eb6c85f0a17b8956d362275a177