[automerger skipped] Merge "mkuserimg_mke2fs: Support passing reserved block percent" am: ca4bf1d719
am: f777984af4  -s ours

Change-Id: Ie74a8062cac2cd3ce0e89edd455ca41d69dbdf08