make file optimizations

Change-Id: I1f8ae58fc6de2f9d2517d9027decf51f1702a2e2