Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

diff --cc android_x86_64.mk
index 9707d81,6ae792d..41b4ef0
--- 1/android_x86_64.mk
--- 2/android_x86_64.mk
+++ b/android_x86_64.mk
@@@ -14,13 -14,11 +14,11 @@@
  # limitations under the License.
  #
  
- $(call inherit-product,$(SRC_TARGET_DIR)/product/core_64_bit.mk)
- 
  # includes the base of Android-x86 platform
- $(call inherit-product,device/generic/common/x86.mk)
+ $(call inherit-product,device/generic/common/x86_64.mk)
  
  # Overrides
 -PRODUCT_NAME := android_x86_64
 +PRODUCT_NAME := cm_android_x86_64
  PRODUCT_BRAND := Android-x86
 -PRODUCT_DEVICE := x86_64
 +PRODUCT_DEVICE := android_x86_64
  PRODUCT_MODEL := Generic Android-x86_64