Merge "Additions and cleanups for ImageDecoder API"