Merge "mkbootfs: consistency."