Merge "mkuserimg_mke2fs finds its sub tools in the same directory" am: dacfcca550

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1505617

Change-Id: I530cef4120f3d7de891bc8883307e712d09d00b4