[automerger skipped] Protect against TOC/TOU bugs in soundtrigger am:...
[automerger skipped] Protect against TOC/TOU bugs in soundtrigger am: c25b0427 am: dfa35ca3 am: 8578b23f -s ours
am skip reason: Change-Id Icdfe5a823ba02eb7bd8c41f0fa503c9922d8f348 with SHA-1 ea51ad6e is in history
Change-Id: I4b1aaa3714d99c12739fba8076318b151b2e629c