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