am fe2d2ac2: am c728c580: Merge "Make sure the encoder instance is safely...
am fe2d2ac2: am c728c580: Merge "Make sure the encoder instance is safely release()\'d before its" into klp-dev
* commit 'fe2d2ac2':
Make sure the encoder instance is safely release()'d before its