Remove non-existing class from autoloader

Change-Id: I1bef84d7e9d4acefc39a1140ea6fc64cea5710d5
Merge "Remove non-existing class from autoloader"