Merge "Replaces 'oneshot' and 'interface' with 'onrestart restart audioserver'."