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

Change-Id: I94580440e2aee6149f6b5e7ada6e05592d32679d