Merge "twopass_encoder: sample and test script fixed." into nextgenv2