Merge "remove OTA packages from the old (pre-froyo) updater" into froyo