Merge "Handle when bias is different in elf headers." am: c48c2afa1e
am: 1e93edb93b

Change-Id: Ie8cc122abdb2c6da672b3854b8e34f622362d6f6