Disable neon assembly when neon is disabled

Change-Id: Idde266cd7287bb6bee016c90efeafa67550f94c6
Merge "Disable neon assembly when neon is disabled"