am 6dfe3e11: Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86"...
am 6dfe3e11: Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into jb-dev-plus-aosp
* commit '6dfe3e11':
Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86