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

* commit '7f14b8ce994011453fbd298ae20d701ebd9e163e':
  Update makefile for resize optimization