Update makefiles for vndk enabled.

Test: none
Bug: 63866913
Merged-In: I10e84e2060c3007b1748a2d8293cdb60787bcf03
Change-Id: I10e84e2060c3007b1748a2d8293cdb60787bcf03
(cherry picked from commit f58aaeba026269603b7eeb770d34d0260ee984ab)
3 files changed