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

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

Change-Id: Ieb464800221fe17ccf58887fec566d1acb269f7d