Remove backwards-compatibility modules from I3947eaac

These were not included in any release.

Change-Id: Ieb927fa9ec1dd19e93ccdbf38595ac11b657d3d3
Merge "Remove backwards-compatibility modules from I3947eaac"