Merge "Turn ndk link check warning into error"