Merge "Make mkbootfs self-contained"