am b45451f6: Merge change 6583 into donut
am b45451f6: Merge change 6583 into donut

Merge commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0'

* commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0':
  Adding a lock to stop so that stop will stop utterances

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base