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