Merge "GraphicBuffer.h: Remove redundant friend class declaration causing warnings" into jb-mr2-dev