Update makefiles for vndk enabled.

Test: none
Bug: 63866913
Merged-In: I29174fdadca2828455ef49f14e53bc95c5238dbb
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
(cherry picked from commit c716b8c3070f560c11fcc0d7d9b8b19af6bbaf28)
24 files changed