Drop more --enable/disable-opengl

Change-Id: Ibf77827455faba2f5d94b9fec26bff512713f73d