Update from my reworked display-legacy, which I used to build libraries (surfacflinger error)