am f531a800: Merge "Update BiDiTest app for adding GridLayout unit tests"

* commit 'f531a800754d6af5c04ee50f15db1ceb00897bb1':
  Update BiDiTest app for adding GridLayout unit tests