Merge "Update to encoder_breakout_test, for non-rd mode."