Bump to 2.4.2
PhilZ Touch 6.25.0

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