BBS 1.5.0.0 RC3

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