Merge "Update makefile for resize optimization"