Merge "Properly handle start code in H264/AVC encoder output" into kraken