Merge "audioid: fix for stlport dependency"