Use a $ prompt where possible

Replace # prompts with $ prompts where root privileges are not required.

Change-Id: Ia7c0388e1b61d8de469d197e47cc5f95ca33bebe
Merge "Use a $ prompt where possible"