Merge "Check machine arch before detecting relocation type"
am: 36efe44516

Change-Id: Ibca32ca680dc5b5e5ccd61c3a0bb974321f02510