Revert "ANDROID: Incremental fs: Fix dangling else"

This reverts commit a040750a.

Set incfs back to rvc shipping incfs

Bug: 178509184
Test: incfs_test passes
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Change-Id: Ie54e29dc84cd980d7ffafce75671ee3193a2a4c6