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

Change-Id: I51f5836f547284202f55a82de85f62861adb5ac5