Update Loki, organize the COT shit, and COT2.2.0.

Change-Id: I508ac6d45bd9c77ea25952a1e6c38961bfbf439f