Revert "msm: vidc: unprepare clocks during power collapse"

This reverts commit 3961510003901f4ebb11a2822936ad940ee294e1.
Revert "msm: vidc: recover from firmware fatal error"

This reverts commit 51594402257a5b18e8ddf5fe41d36b930cd72e74.
Revert "msm: vidc: Free OCMEM during power collapse"

This reverts commit 268e7b8cc518ccb18dc2df0e4787195db7fe701b.
Merge branch 'cm-11.0' into kk_mkt