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

Change-Id: I6d68cbf646907cf997924794367368e46dcb5d5c