Merge "Define vendor-specific property ro.incremental.enable"