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

Change-Id: I1e2ff138b26cd2b0c3474ca7021c6c63da7655be