am 81cd0d8d: (-s ours) am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev

* commit '81cd0d8d52f83bf3cc6193dead8aa6486d23bdc0':
  Resolve color xml attributes properly. [DO NOT MERGE]