am 6a944e5e: am b9a8aa63: Merge "Fix prebuilts for target builds with USE_MINGW=1."

* commit '6a944e5e0b9dde4aa086d83555adfe09df3f472e':
  Fix prebuilts for target builds with USE_MINGW=1.