Merge "Packages on IncrementalFS can't have oat dir." into rvc-dev