Merge "arm64: armv7 assembly file is not needed." am: c3d410dc7a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If482ce63ac58970e87ef603c2cb9f32262b9f48a