XPrivacy 2.1.26

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
Google Keyboard update

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
PA GAPPS 20 July

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
	_archidroid/gapps/core/system/priv-app/Phonesky.apk
	_mrturdroid/gapps/system/etc/g.prop