Merge "Fix handling of ro segments for embedded libs."
am: 583ce2deff

Change-Id: I525d51e3f5aab094f4ce374d7eca27d02bf444ca