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

Change-Id: I4644837ceed83e95feec41c1751212ad7384cbf8