Merge "Fix build with memory-mapped coverage (patch 2)" am: 64d16336bc am: 0c7c067f57 am: c7d022ecbf

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1906672

Change-Id: I4b800029065b18dd91b436e45ebb4faf309fda55