Correctly parse colours defined as "#..." or "#...." am: 1ec150e514 am: 2531023f15

Change-Id: I715de7d91f011b16758a59d19e798f9fddf61885