am 805b1690: (-s ours) Move support library to r8. do not merge.

* commit '805b1690679072a6295ff073d4b233e069d8b49b':
  Move support library to r8. do not merge.