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

Change-Id: I42aefbacf31fca41a0a92e80cdf0fe0deacf47ec