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

Change-Id: I1765660b21e2de6e9b95b21c73d2cf037c855dcd