Changes required to switch back to CM's native+av frameworks - fyodor

Change-Id: I667055f56b59cb775c772a251981596ab2083d95