Remove two obsolete files.

Change-Id: I3e40dc713435f5c653c1aff28a450fd3fb75055c
Merge "Remove two obsolete files."