Update soundscape for L, using classic names.

(partial revert of commit 7348f744)

Bug: 15725449
Change-Id: Ic1a038c906deab035f96caed42fc16c59d459965
64 files changed