Merge branch 'kitkat' of github.com:AOSPA-legacy/android_vendor_pa into kk4.4

Conflicts:
	vendorsetup.sh

Change-Id: Ide0f3c279768802ec66b23bdf412fbf63c7465c9