Fixes problems importing naked distro tree.

Bug: 951981