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

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

Change-Id: I9161c0a1ed3c4a9996b4c3009231128c59715f29