PA GAPPS 25 July

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
	_archidroid/gapps/system/priv-app/PrebuiltGmsCore.apk
Fix broken hardswap on AD 1.X
Add missing hook for Wanam Xposed
RunOnce: Disable torchlight on Sammy, it causes some wakelocks
XPrivacy 2.2.2

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

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

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
	_archidroid/gapps/system/priv-app/PrebuiltGmsCore.apk
Remove BBS

Conflicts:
	META-INF/com/google/android/aroma-config
	META-INF/com/google/android/aroma/_changelog.txt
	META-INF/com/google/android/aroma/thirdparty.txt
	META-INF/com/google/android/updater-script
	_archidroid/apps/betterbatterystats/system/priv-app/BBS.apk

Conflicts:
	META-INF/com/google/android/aroma-config
	META-INF/com/google/android/aroma/_changelog.txt
	META-INF/com/google/android/updater-script
MX Player 1.7.30

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