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

Change-Id: Iab2394c7797f3002c4ad963cae4d43e47b495c26