Merge changes from topic "sharedlib_in_recovery"
am: 2583b0adb2

Change-Id: I4057da23e469be6c0547ae9416ff3d194672cbd6