Fix issue with build.prop build

I found what' wrong. Some commits have to be reverted or only this one.

I've checked that everything below commit "Fix USB mounting" complie without errors.