Merge "Add an asset source for ImageDecoder" into pi-dev
am: 51d2cc45d8

Change-Id: Id54fef03d3ac97a259bb6f71721407962c76c067