Get Android.mk working for windows ndk build for new sample layout.