replacing vdsp calls for pkmmatrix
Merge remote-tracking branch 'upstream/master'
merged parag's renaming conventions