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

* commit '6d1efdcbf8f9f0448eadf5b343e0dd284bc40208':
  Android.mk: make 32bit binary use arm assembly code on 64bit platform