am 35710ab0: am ffe3e96a: Merge "GLConsumer: Fix crop math"

* commit '35710ab014b6ff4a914f00509ecb34737d37fb47':
  GLConsumer: Fix crop math