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

Change-Id: Ide827aebb6203740a6ad918f67456a7fa7bcf848