Fix detection of NDK path change for non-default layouts
Add NDK layout used in Android source tree