Merge "Remove unused code from CompatModePackages, clean up CompileSdk strings"