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

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