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