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

Change-Id: I2a120d4250bfb0c32129fd3409c7f1c13f28c20a