Merge "CodecAsyncHandler: Fix race issue in async mode" am: 1392c5898c

Change-Id: I2f72b984b8e4da7e811a63a748b3ceb0a65a0e8a