Merge "ExtractDecodeEditEncodeMuxTest: Stopped using resources in apk" am: 9a05452828

Original change: https://android-review.googlesource.com/c/platform/cts/+/1425580

Change-Id: I3cf94d44c9d81d46efc86e4fbf8f9a3ccd8688e1