Merge "Revert "Define vendor-specific property ro.incremental.enable"" into rvc-dev