derp

Change-Id: I1ed5ff6297368778d9b40505e96878f957632caf
Merge branch 'cr-4.4' of https://github.com/ChronosRom/chronos_manifest into cr-4.4