Merge remote-tracking branch 'cm/cm-14.1' into nougat-x86