more pawitp changes, latest cm 12 changes.

Signed-off-by: k2wl <kar2wlan@gmail.com>
Merge branch 'lp' of github.com:k2wl/patches-i9082 into lp