Merge "Move the resources for big screens to values-h600dp instead of w1024dp" into nyc-car-dev