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

This reverts commit 3e18f3964964cc828be4aba80c8e5406e2c686eb.

Change-Id: Ieb35d8e3ea4187388902adae4c9105e281f16c93