Merge "Removing non-executable code from encoder_encode()."