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

Change-Id: I96ae107012b6f71c23fa7f26d07ac83c3049dcfd