Merge "Revert "Use "gfxstream" namespace""