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

Change-Id: I5d63fa0d56e0468ad320baf379c6d4412356fa1f