am faa031ab: (-s ours) Fix GridLayout in support library. do not merge.

* commit 'faa031ab689f44a269a69ebfbcd49d9937d0fdc6':
  Fix GridLayout in support library. do not merge.