Merge "Move graphics APIs to the light grey." into pi-dev
am: d8d05ecc64

Change-Id: I3d2021625786591bdca46ad3f255273c635b1cf0