Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev