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

Change-Id: I24ab778cc4acf1d89ac82be2f0d282409a8db748