[TEST] possible fix for image funk

Revert "armv7-a-neon.mk - append, don't replace... and do some flag massaging"

This reverts commit 232b982b7835a442e6f0c7a477c8701379f14875.

Change-Id: Icc7c339ccca251b039f0079a5e46bc3c9d2df482
Reconcile w/ CM

Change-Id: I043e61eb5f2f6c9f6f2d475287bdfccdb533bf0a