Merge "Add a sound-playing method to Camera API." into ics-mr1