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

Change-Id: I77d95e4045d5c1c7dab4bda1797f1a338594334d