Merge "DecoderTestAacFormat: Stopped using resources in apk" am: f4e4dd402a

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

Change-Id: I56d40f85fbf7ce92d5611ad21a6fb3b20dc86ce2