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

Change-Id: I8bb3949bdd5be5fc4357998de4d8073594eed3ac