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

Change-Id: I3ecc726c74b5120a52d63c36f4cf627048ed8939