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

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

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