Merge changes I4faf15bd,If328eac6

* changes:
  Use the LLVM libs with "_android" suffix
  Use the LLVM libs with "_android" suffix