Merge changes I6bb76601,I552ee6a7 into studio-1.4-dev
automerge: 1815bcb

* commit '1815bcb8d6d6b5e1f506b50ec164a7194f0f2296':
  android-rebuild.sh: Copy e2fsprogs to $OUT_DIR/bin
  build-e2fsprogs.sh: New build script.