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

This reverts commit a2429bd7 and
commit e41afe13.

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: Ib06d0808cd742a44f869e51dd21d764b6ebf2a3e