Tweaks for NDK build

Change-Id: Icc1df69ee22985a7d001fff7ac04cb65c9aa8bae
1 file changed