DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c am: 08a4808197 am: 7298186769 -s ours am: 02b5805ba3
am: 93510f46e0
* commit '93510f46e0f4be83fae3a81fb7aac61de8728b42':
Change-Id: I91db9913f0ffc3e75cf0c30b2fed5dd65e32e2fd
This commit is contained in: