Merge "Use the non-jet version of libsonivox" into rvc-dev am: 7d46c0b6f3 am: fbd8871732

Change-Id: I6cc9f08a714027b38312648b87a4dd71eef313fe