Merge "docs: editorial revisions to the bmgr tool doc" into froyo