Merge "Add an include path to allow moving header files in goldfish-opengl"