am c8c68c88: Merge "Use aligned width and height to compute size." into lmp-mr1-dev

* commit 'c8c68c88c1f0eed0c647b0a9cdf1c402aecb2667':
  Use aligned width and height to compute size.