Windows seems to be unhappy about bpixel.cxx removal.
This partially reverts 3abfdd08.

Change-Id: I3a27bafa9ead14ba19d0f00a6be086df6c468e19