Merge "Basic audio/video encoder/decoder test." into oc-dev am: 13d6297319
am: 858099c1b4

Change-Id: If54d203198c741ce50fd938c9d05d5224c12fefb