Revert "ANDROID: incremental-fs: fix mount_fs issue"

This reverts commit 4ab5bac1 and
2da7ed1f.

This is to fix the incrementalinstall test.
Can now install the same apk twice, and repeated installs are stable.

Bug: 217661925
Bug: 219731048

Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org>
Change-Id: I77f038b296041b329060ff9350e4c9711f5ed91d