* Made some inherit-only contracts internal.

* Added OwnableMock.

(cherry picked from commit 96d6103e)