Merge branch 'zramdroid' into kitkat