Fi Viper4Android causing issue.

Change-Id: Iec18f569614ff323e685d81364fe84976d1d2736
Merge github.com:TeamBliss-LP/android_vendor_cm into lp5.0