Merge "Add test_com.android.media[.swcodec]"