XPrivacty 2.1.17

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

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

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

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
	_archidroid/apps/betterbatterystats/system/priv-app/BBS.apk
PA GAPPS 29 June

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

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
	_archidroid/gapps/core/system/app/ChromeBookmarksSyncAdapter.apk
	_archidroid/gapps/core/system/lib/libgoogle_hotword_jni.so
	_mrturdroid/gapps/system/lib/libgoogle_recognizer_jni_l.so
	_mrturdroid/gapps/system/lib/libvcdecoder_jni.so
	_mrturdroid/gapps/system/priv-app/Velvet.apk
misc