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

Change-Id: Ieaea2d308c0ca02301adfb58d858bc8a574c6188