am 007faa43: Merge "add support for LOCAL_MULTILIB"

* commit '007faa43cf380013e2510363b707e46884f1466c':
  add support for LOCAL_MULTILIB