Merge "ExtractDecodeEditEncodeMuxTest: Stopped using resources in apk"