Merge "Check machine arch before detecting relocation type" am: 36efe445 am: 36e8d459 am: 69d05c96 am: 2d992f2a Change-Id: I07172d7b372c5d7731951d1917f8e0aaf456539d