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

Change-Id: Ib3603cd9d77b3659d9be7e47055982474d227746