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

Change-Id: I2bd72d6fb18cf8303a7dd42d6c47eaea75ef4bbc