Merge "Move the png open and destroy functions into a class" am: e687c5a1e1
am: 297a994416

Change-Id: Ic33be526b2bae0533d42477dfb618579f9e97035