Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev