Merge "Cleanup addtional files that were missed in the first purge of AvoidXfermode" into nyc-dev