Use our own Theme Manager files

PA removed them from their vendor

Change-Id: I3d368acb39976f9a6fd55b80ecdb02653aa488be