Merge "Consistently use - rather than _ in fastboot option tab completion." am: 52cd10fed6
am: f51faea1ca

Change-Id: I69f13f7bf6907e7edca7b0e8bcfdbf9e3ab86de6