Merge "Disable compat_elf_hash_and_relocation_tables test for x86" am: fe96db819b
am: 72aed61800

Change-Id: I922a143d5cb0c553cc55cf408026fdcb66d9197c