Merge "DO NOT MERGE Remove graphics.cpp and friends" into oc-dev
am: c4a3020c4d

Change-Id: I4bc2e9c9cc528e9fe35741516065b5ea46179bfe