Merge "Remove VNDK definition(s)" into main am: 6cc454b6e9 am: 0949bb769b

Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2995709

Change-Id: I85c8d208e193a2800e15ab3ea98475a8ea695255
Signed-off-by: Automerger Merge Worker <[email protected]>