Merge "Add resource color test" into lollipop-mr1-cts-dev