Merge "Add METATA for libpng" am: 3a08d09702
am: 7ad9526619

Change-Id: Ib6d3ec6007610ed910045573a42d91a76ed07a9b