am 42cbe355: am 805b1690: Move support library to r8. do not merge.

* commit '42cbe3559b59483383e66f4bff95a2c073da835d':
  Move support library to r8. do not merge.