Merge "Fix offsets when shared lib split across maps." am: 1baa19b1a6
am: b211c87717

Change-Id: Ib3445dcd16a01056ebc12a307d767c58974a26c2