am 6cd8771c: Merge "GLConsumer: Fix crop math" into mnc-dev

* commit '6cd8771c9cb9512e094bc2944bb7dd38665c1838':
  GLConsumer: Fix crop math