Merge "Fixup OBB directories correctly after package install."