Cherry pick https://codereview.chromium.org/22574004/
Cherry pick https://codereview.chromium.org/22574004/

Make targetDensity-dpi account for deviceScaleFactor correctly.

Bug=10178387

Change-Id: Ib0eb21c1828abcb1a10a7f09a42a49bf8b2a6a7f

geekboxzone/lollipop_external_chromium_org_third_party_WebKit,geekboxzone/lollipop_external_chromium_org_third_party_WebKit,temasek/android_external_chromium_org_third_party_WebKit,temasek/android_external_chromium_org_third_party_WebKit,DARKPOP/external_chromium_org_third_party_WebKit,mydongistiny/external_chromium_org_third_party_WebKit,temasek/android_external_chromium_org_third_party_WebKit,DARKPOP/external_chromium_org_third_party_WebKit,mydongistiny/external_chromium_org_third_party_WebKit,TeamEOS/external_chromium_org_third_party_WebKit,TeamEOS/external_chromium_org_third_party_WebKit,TeamEOS/external_chromium_org_third_party_WebKit,xin3liang/platform_external_chromium_org_third_party_WebKit,android-ia/platform_external_chromium_org_third_party_WebKit,DARKPOP/external_chromium_org_third_party_WebKit,mydongistiny/external_chromium_org_third_party_WebKit,TeamEOS/external_chromium_org_third_party_WebKit,Fusion-Rom/android_external_chromium_org_third_party_WebKit,android-ia/platform_external_chromium_org_third_party_WebKit,Fusion-Rom/android_external_chromium_org_third_party_WebKit,xin3liang/platform_external_chromium_org_third_party_WebKit,mydongistiny/external_chromium_org_third_party_WebKit,DARKPOP/external_chromium_org_third_party_WebKit,Fusion-Rom/android_external_chromium_org_third_party_WebKit,TeamEOS/external_chromium_org_third_party_WebKit,DARKPOP/external_chromium_org_third_party_WebKit,Fusion-Rom/android_external_chromium_org_third_party_WebKit,TeamEOS/external_chromium_org_third_party_WebKit,geekboxzone/lollipop_external_chromium_org_third_party_WebKit,Fusion-Rom/android_external_chromium_org_third_party_WebKit,Fusion-Rom/android_external_chromium_org_third_party_WebKit,android-ia/platform_external_chromium_org_third_party_WebKit,android-ia/platform_external_chromium_org_third_party_WebKit,temasek/android_external_chromium_org_third_party_WebKit,android-ia/platform_external_chromium_org_third_party_WebKit,mydongistiny/external_chromium_org_third_party_WebKit,android-ia/platform_external_chromium_org_third_party_WebKit,DARKPOP/external_chromium_org_third_party_WebKit,android-ia/platform_external_chromium_org_third_party_WebKit,xin3liang/platform_external_chromium_org_third_party_WebKit,temasek/android_external_chromium_org_third_party_WebKit,xin3liang/platform_external_chromium_org_third_party_WebKit,geekboxzone/lollipop_external_chromium_org_third_party_WebKit,geekboxzone/lollipop_external_chromium_org_third_party_WebKit,TeamEOS/external_chromium_org_third_party_WebKit,android-ia/platform_external_chromium_org_third_party_WebKit,xin3liang/platform_external_chromium_org_third_party_WebKit,temasek/android_external_chromium_org_third_party_WebKit,Fusion-Rom/android_external_chromium_org_third_party_WebKit,Fusion-Rom/android_external_chromium_org_third_party_WebKit,mydongistiny/external_chromium_org_third_party_WebKit,android-ia/platform_external_chromium_org_third_party_WebKit,android-ia/platform_external_chromium_org_third_party_WebKit,geekboxzone/lollipop_external_chromium_org_third_party_WebKit,geekboxzone/lollipop_external_chromium_org_third_party_WebKit,mydongistiny/external_chromium_org_third_party_WebKit,TeamEOS/external_chromium_org_third_party_WebKit,Fusion-Rom/android_external_chromium_org_third_party_WebKit,temasek/android_external_chromium_org_third_party_WebKit,temasek/android_external_chromium_org_third_party_WebKit,xin3liang/platform_external_chromium_org_third_party_WebKit,Fusion-Rom/android_external_chromium_org_third_party_WebKit,xin3liang/platform_external_chromium_org_third_party_WebKit,TeamEOS/external_chromium_org_third_party_WebKit,geekboxzone/lollipop_external_chromium_org_third_party_WebKit,mydongistiny/external_chromium_org_third_party_WebKit,DARKPOP/external_chromium_org_third_party_WebKit,temasek/android_external_chromium_org_third_party_WebKit,mydongistiny/external_chromium_org_third_party_WebKit,DARKPOP/external_chromium_org_third_party_WebKit,geekboxzone/lollipop_external_chromium_org_third_party_WebKit,xin3liang/platform_external_chromium_org_third_party_WebKit,geekboxzone/lollipop_external_chromium_org_third_party_WebKit,DARKPOP/external_chromium_org_third_party_WebKit,TeamEOS/external_chromium_org_third_party_WebKit,xin3liang/platform_external_chromium_org_third_party_WebKit,temasek/android_external_chromium_org_third_party_WebKit,mydongistiny/external_chromium_org_third_party_WebKit,DARKPOP/external_chromium_org_third_party_WebKit