Merge "Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev am: 5c5c544e80" into oc-dr1-dev-plus-aosp
am: 06a1ece4d4  -s ours

Change-Id: I31250dd849794471d71801e50bf83e9c275a676c