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

Change-Id: I7cd46beb061af53f39831daea32556ad426bae28