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