Merge "arm64: armv7 assembly file is not needed." am: c3d410dc7a am: 06705ae977 am: 5c44010b70

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c92288049ee3073cdab9c6608921f21fdafbc2a