Switch to forked hardware_qcom_keymaster
Fix Flinny derp :p

Change-Id: I4de61630579c3d317c81b34bd2ad14aaa1cdef90
track DSPManager from cm -> thanks

Change-Id: I4ce8e4d1e252f9b23ca9b1a2a21b876dfce92367
Merge branch 'slim-4.3' into jb43

Conflicts:
	default.xml