Update makefiles for vndk enabled.

Test: none
Bug: 63866913
Change-Id: I10e84e2060c3007b1748a2d8293cdb60787bcf03
3 files changed