Revert "Merge remote-tracking branch 'slim/kk4.4-caf' into vaosp"

This reverts commit 3f05d6778649dbba5176243cbf068dba19823340.