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

Change-Id: Iec4422c305d7ad27ff101de195b7f62c1c92413a