Merge "Move default sounds to /product"
am: 6feab6bf6c

Change-Id: I36f9e88d465dcf0417ea73e5e3bfbd9c38bb1398