am 65098d0d: Move support lib to r11

* commit '65098d0da5bd04fac0b2bcf044f32c4a38548031':
  Move support lib to r11