Merge "Un-@hide new download manager public API." into gingerbread