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

* commit 'd77109def0b7b7fe3fadaca9bdadd19f01356535':