am 4dd6fee7: Merge change Ieb4b0318 into eclair

Merge commit '4dd6fee7e444c65f3613b4126124622b32a5d4ff' into eclair-plus-aosp

* commit '4dd6fee7e444c65f3613b4126124622b32a5d4ff':
  Make default vertex program correctly track surface size.