Correctly parse colours defined as "#..." or "#...." am: 1ec150e514 am: 50808e1afa am: 9ff78e1d06 am: ccd5722638

Change-Id: I076a182f3fb49fea32975a4a98cb1f0bad4bab17