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

Change-Id: Id71f26babe8614a996d09e6af34df73ae85ac83d