Merge "Enable overrides for shared libraries"
am: d04107683b

Change-Id: I334167a048a2d7b02cc64c6b63ea04a5713d115a