Merge "SoundRecorder crash if click start/stop button quickly" am: 244b758346 am: f1cfef4ea0
am: 9e3048285a

Change-Id: I8e03e4a1a6cb38af077c21791d6d935a69bff30a