Merge "Frameworks: Remove AsyncTask from preloaded-classes"