Merge "Fix bug 5185010 - android:backgroundSplit doesn't accept a color value"