Merge "Import the d/g/goldfish-opengl namespace" into rvc-dev am: ff8cdcb969

Change-Id: Ib9235815c3b81da5ba50f840e89d0f437f928523