Update makefiles for vndk enabled. am: a129dc9c86
am: 730d57cab1

Change-Id: I6da2ec400d55a771e69ad8531677dc60477a3d97