Revert "aries; Fix graphics.c to build with new AOSP"

This reverts commit 4ce35eaa4296116c6b6c9275abb24c33b678f145.