Merge "Add OBB file helper class" into gingerbread