Merge "Check for e2fsprogs prebuilts dir in android-configure.sh" into studio-1.4-dev