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

* commit '5e40f4e2dfbfdddccc40e538f9eae1737883a3e5':