Merge "Fix bug preventing multi-module native coverage." am: 3372ce615a am: 74ef8e0a88
am: 9a0b234763

Change-Id: Ia145ecc5e64abc138baca462c5ca953eb9b19e2b