Merge "Revert "[Bugfix][T106BUG-246]fix fakeroot compile error""