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

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

Change-Id: I2b51ca1ad927b06ab448e4ca6c1a3b39beb8b4fe