Merge "Compat methods for Context.getColorStateList(int) and getColor(int)" into mnc-dev