Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo