Merge "Scale up in ImageDecoder based on API level" into pi-dev am: 83ad4e53b6
am: 27e12ac211

Change-Id: Ie015dd5fe1ebcf66fbb347c9183062c6cd5b1714