Merge "ActivityManager: add option to allow OpenGL trace."