Remove legacy 3.8.1 classes
am: 743bb726af

Change-Id: I2c8d6dda1bf0d941b535338e5e6435bdd27ca9aa