Merge "Fix the preloaded-classes tool for JellyBean." into jb-dev