p3100, p3110

Change-Id: Iaffba3c30288dde5d604423301392f31e82706b3
Merge branch 'kitkat' of github.com:InspireOS/android_vendor_InspireOS into kitkat