am d0b1fac1: Merge "Make sure resume() and flush() are handled appropriately...
am d0b1fac1: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
* commit 'd0b1fac1':
Make sure resume() and flush() are handled appropriately even if the codec