am 180ba44d: am 7f14b8ce: am 0168fe3b: Merge "Update makefile for resize optimization"

* commit '180ba44d213033d1624f306871e4fd3f15f8ac90':
  Update makefile for resize optimization