Merge "StageFrightRecorder: do not use meta-data mode for software encoders" into klp-dev