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

Change-Id: I05884b4b1dbd604c4c2bdec961bf51c376ef6ba1