Merge "Fixed iwalsh_neon build problems with RVDS4.1"