Merge "Move OBB file reading to DefaultContainerService" into gingerbread