Merge "Check NDK version in the app build script" am: 197032faf3
am: cf0f927df4

Change-Id: Ie9c979ff77c5edaea7d01fb510ef5ab140afeaa3