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

Change-Id: I7c338ab97fa6f959f000626d88699ceeabe44630