CAF Merge Part 2

Signed-off-by: Javelin <javelinanddart@gmail.com>
Merge branch 'lollipop' of github.com:javelinanddart/rain_kernel_htc_ville into lollipop