Merge "libsonivox doesn't need libutils and libcutils"
am: 070e31de1e

Change-Id: I73ba2da9ce8c8c1579ba070a81436b05ee6a27e9