Merge "clarify what\'s in each windows package and rename the other packages...
Merge "clarify what\'s in each windows package and rename the other packages to command line tools am: 6b2a9863 am: 6e56ea19 am: 25afc407 am: f97b6855 am: c7e650a5" into nyc-mr1-dev-plus-aosp