Merge "DecoderConformanceTest: Stopped using resources in apk" am: 9f14cb03d0

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

Change-Id: I1a0a6cd0ff4b161eaeb91f5456044f878b0155fd