Merge change 27116 into eclair

* changes:
  Fix http://b/2131173 (gaps between Gallery tiles).