Merge "Enables GVN for x86 and x86_64."
am: 9c0a6ce0a4

Change-Id: I0b05d86a122752f0f0afde86c55cde789c6153e6