Merge "Merge "CTS: change resource file on hdpi density" into lollipop-mr1-cts-dev am: 6f7d4ba7be" into marshmallow-cts-dev