Merge "Make the NDK not found error message a little more constructive"