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

Change-Id: Id6aad52ccb869d3b04d5b687d9bb93c6e4aa80f0