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

Change-Id: Ife0337b05f5d3945fbdb54445eacfa7e758e209c