AOSP tracking changes

Conflicts:
	default.xml