Merge "OtaDexopt: Special-case system app classpaths" into nyc-mr1-dev