track CM frameworks/av and /native

Change-Id: I88d4def1d3ad2eaf0fce8ab423ec481e6b70cbe1
Merge branch 'cm-10.1' of git://github.com/Mustaavalkosta/android into cm-10.1

Conflicts:
	local_manifest.xml