Update makefiles for vndk enabled.
am: a129dc9c86

Change-Id: Id4149b6f95557faf508cc7f0fe27061f9fbe527b