Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread