am c5f124b2: (-s ours) am 638d3a2d: am 8300161f: am c8d60141: am f48e02e3: Fix support lib compilation. DO NOT MERGE.

* commit 'c5f124b20c1e94a93a97f813750158a56377ee81':