armv7-a-neon: fix conflicting cortex-a15 feature set

Change-Id: I74f843258aa862f0698d2ebb81faf7cf028a82df