Merge "Expose PngHandler via resources.h." am: 3c8fdf3274 am: c41aba80b7
am: 488e2c1e84

Change-Id: I9a5efd24428426f90b54e9fc0569a01332b0eabd