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

Change-Id: Ia4f7085b1e9da70668655516501759ca68893877