Update makefiles for vndk enabled.
am: f58aaeba02

Change-Id: I0bbde3b2d347b9bc648ef86d361ba5715f3c9355