Merge "Merge "DO NOT MERGE Sonivox: add CTS test." into kitkat-cts-dev am: eb7f4d9  -s ours" into lollipop-cts-dev