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

Change-Id: I25b2bd07ebee7d476558fc2cae7e1642e8a7a412