CAF Merge Part 2

Part of CAF Merge

3Part of CAF Merge
Merge branch 'lollipop' of github.com:javelinanddart/rain_kernel_htc_ville into lollipop