Merge cm11

Change-Id: I1b56c7dbb48c03c29d4c3d8e96d44bd4152a7366
Merge branch 'kitkat' of github.com:Collective-Phoenix/android_external_libsepol into kitkat

Merge cm11