Merge "Use APP_PROJECT_PATH if NDK_PROJECT_PATH isn't set"