Merge branch 'master' of git://android.git.kernel.org/platform/development into merge_korg_master

* 'master' of git://android.git.kernel.org/platform/development:
  Value for windows condition is missing a dot before "exe". "adbexe" should be "adb.exe"
  Add the FixedGridLayout sample code.
  Fix NullPointer exception in function getBrokenAvds()