Merge "Fix GraphicBuffer leaks in system_server" into oc-dev
am: a40bb1ed4a

Change-Id: Iefb739b06406216a943c9f3ac31fed48cd3eb53b