am 7b71a7b1: Merge "Rounds up scaled width/height" into gingerbread

* commit '7b71a7b1d6748278ba72b72a7647cbf3ea32da0c':
  Rounds up scaled width/height