am 8fd5fb34: am 96dcc3a9: am 7259bae0: Merge change Ied94685e into donut

Merge commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9'

* commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9':
  Add NDK version reference to template.