am abcaa390: (-s ours) am 624c4870: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge

* commit 'abcaa39070a6d02ccdaceae11b856545df959a23':