Merge "Prepare code to allow image decoder to be reused" into pi-dev
am: 9c5f5b7589

Change-Id: Idb22b5633bc2f9d0dad0fbe809c8e6bd5cdec459