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

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

Change-Id: I4247200020dec520b8280abffa9424867ec56cb4