Merge "Never scale nine-patches in ImageDecoder" into pi-dev
am: 9cb6759072

Change-Id: I468c9a0c0b83713e86c49612f27c672e957572df