Merge "Cleanup comments on hevc encoder plugin"