Restore Android/ARMv7 build fix from #778
Restore Android/ARMv7 build fix from #778

for #1811
xianyi/OpenBLAS,xianyi/OpenBLAS,xianyi/OpenBLAS,xianyi/OpenBLAS,xianyi/OpenBLAS,xianyi/OpenBLAS,xianyi/OpenBLAS,xianyi/OpenBLAS