Bump to 2.5.3

Conflicts:
	META-INF/com/google/android/aroma-config
Update manifest