Merge "OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3 am: 18d954183a" into nyc-mr1-dev-plus-aosp
am: e2dadf9914

Change-Id: I018e0b33d2a143de9b6c880026ae51ca224030f3