Merge "DO NOT MERGE: Update the hdpi resource files" into nougat-cts-dev
am: dcf7b04f17  -s ours

Change-Id: Idf21bcedddffdda7ecce660fac157b6be666526b