Adapt to new AOSPA vendor
Merge branch 'kitkat' of https://github.com/AOSPA/paranoid into kitkat