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

* commit 'c6418c04abe23f86b3214c3bb935a5988b1bb64a':
  Cleanup addtional files that were missed in the first purge of AvoidXfermode

Change-Id: Ica5d8093aa776889240af177d900381c4f807d48