Merge "media bitstreams test: pull file and read instead of adb shell cat" into oc-dev am: aa7c732187
am: 1e984e9827

Change-Id: Idac036b012593c24f6aa34cb532b0349170d6f41