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

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1813057

Change-Id: Ice952ff6ecccb9e3fe6c1ad670ff36b1d198062e