Merge "libsonivox doesn't need libutils and libcutils"