Merge "Consistently use - rather than _ in fastboot option tab completion."