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

Change-Id: I5d633c1827ca1e5ec8cc982b1057b86db02030de