Fix armv7-a-neon ARM version

Change-Id: I41ea122acca7e9e9561072ddfdfbabe97d891ad3
Target androideabi back to 4.9 (from google prebuilt 4.9)

Change-Id: I354d23712807a7b219cf63378d524b312679bf17