Merge "mkbootfs: Fix the default st_mode for root directory." am: 3dee9f1f6f am: 78b352624d
am: 7f8f35ccec

Change-Id: I368572a38b1e24224df04c80c110fdeca5e575ec