Fix git ps1 parsing with heavily colored PS1s

Change-Id: I41a4ccf9be39acaf254d54aeae8f6736e4658f63
Merge "Fix git ps1 parsing with heavily colored PS1s" into kk44