Revert "Fix STE OMX"

This reverts commit a2e251272bb11210041622e3bd10eb773b9cbd29.
Revert "Fix STE "OK Google""

This reverts commit 567c4d3e2f2a9d35e831a9b42b89546bc5cd883f.