Update import statements in accordance with changes to the XBlock repo.

@cpennington