am 53e3c7d8: am 805b1690: Move support library to r8. do not merge.

* commit '53e3c7d833045f56624e09c4cf1ff4650e1ba6fe':