Merge "Android.mk: make 32bit binary use arm assembly code on 64bit platform"