Update makefiles for vndk enabled. am: 5e59402492
am: 271d53d836

Change-Id: I47ffcee7c1aa9c1d7f5c3750cc93294ff740f20d