Merge remote-tracking branch 'cyanogen/cm-12.0' into HEAD