Merge branch 'cm-12.1' into lollipop-x86