am 2ec7a5c0: am a5afedd2: Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build"

* commit '2ec7a5c0f679a0d1e83ebc55479d1b8bbcb79f7d':
  Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build