Merge "Fix bug preventing multi-module native coverage."
am: 3372ce615a

Change-Id: I2ae9aa039b6fe5d375b514a9a5fb9cb2697bca55