Revert "Optimize ubuntu mirror build"

This reverts commit 00034d254a0cf72837f16d6f91431915703b2eb9.

Change-Id: I7c416cc39420f03bab5a593dfb1033b6b9363fb1
Merge "Revert "Optimize ubuntu mirror build""