Merge "external/svox is going away."
am: ff806ece8d

Change-Id: I1c3fa0d99c6cf53c6266e7c775addcbde56114f9