Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo