Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build"