am df9964ee: am 46e0f460: Merge "Fix mod-union logic for native roots"

* commit 'df9964eecad0821a791c54210d3fab67a06e9a19':
  Fix mod-union logic for native roots