Merge "Fix GraphicBuffer leaks in system_server" into oc-dev