Default resource file name for colors.xml

When using IntelliJ's or Android Studio's intentions
(alt-enter) on colors it tries to add a new color resource to
colors.xml not the old color.xml.

Change-Id: Iec61a67213b2248f33616e872e09efcc05640899
Merge "Default resource file name for colors.xml"