Cleanup addtional files that were missed in the first purge of AvoidXfermode

bug: 14650725
Change-Id: Ib7fb6a31705fb60535ecf2017db321c15e3d06cc
3 files changed