Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair * commit '7259bae08d7915c0d5ba6427c815d7576c0ef045': Add NDK version reference to template.
Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair * commit '7259bae08d7915c0d5ba6427c815d7576c0ef045': Add NDK version reference to template.