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

Change-Id: I7db05bc821316ac046f125c42ea332051c1f2f69