Merge "Frameworks/base: Update preloaded-classes" into nyc-dev