Merge "Add files for the adaptive playback test" into oc-mr1-dev
am: e529309b1b

Change-Id: I3cab9320702ce937b0682b15a78877cffda5a7e4