Merge "Check for e2fsprogs prebuilts dir in android-configure.sh" into studio-1.4-dev automerge: 33667f4
automerge: 88a6f5c

* commit '88a6f5c6b97abf43f1ce097f67c8508fd4f49909':
  Check for e2fsprogs prebuilts dir in android-configure.sh