material atts testing
Merge remote-tracking branch 'head/material_develop' into material_develop

Conflicts:
	BaseAndroidTest/src/main/res/values/colors.xml