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

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