Merge "Stop double-counting native memory in graphics classes"