Merge "Turn on NEON support for Nexus S"