Merge "Scale bitmap shaders for target density" into nyc-mr1-dev am: 0f6cec369f
am: 5b032486f3

Change-Id: I1cbe76bd8d20f1ae53b29888b427c721e24b8812