Merge "Add a graphics owner for graphics.h." am: 3303c5d520
am: ca8ffc893b

Change-Id: Iac8a7699dddd1660636be296f0741cf19714852d