Merge "Add METATA for libpng"
am: 3a08d09702

Change-Id: I031d30f71acb1dd6ac4f80a3f46135ad1083d1e4