Merge "Explicitly set LOCAL_MODULE_TARGET_ARCH"
am: 31e24e1

* commit '31e24e118fb861a43121dcb0efd1f88606423206':
  Explicitly set LOCAL_MODULE_TARGET_ARCH