Merge changes from topic "sharedlib_in_recovery" am: 2583b0adb2 am: bbf6d709d4
am: 97d4fea5a0

Change-Id: I4e7550f8904dc572f34f7aeb63c973feae711536