Merge "Add support for x86 to hello-neon sample"