Fix Android build.

src/OpenGL/compiler/Android.mk

@@ -37,8 +37,8 @@ COMMON_CFLAGS += -D__STDC_INT64__
 endif
 
 COMMON_SRC_FILES := \
-	preprocessor/Diagnostics.cpp \
-	preprocessor/DirectiveHandler.cpp \
+	preprocessor/DiagnosticsBase.cpp \
+	preprocessor/DirectiveHandlerBase.cpp \
 	preprocessor/DirectiveParser.cpp \
 	preprocessor/ExpressionParser.cpp \
 	preprocessor/Input.cpp \

src/OpenGL/compiler/preprocessor/MacroExpander.cpp

@@ -69,7 +69,7 @@ class MacroExpander::ScopedMacroReenabler final
 	~ScopedMacroReenabler();
 
   private:
-	PP_DISALLOW_COPY_AND_ASSIGN(MacroExpander::ScopedMacroReenabler);
+	PP_DISALLOW_COPY_AND_ASSIGN(ScopedMacroReenabler);
 
 	MacroExpander *mExpander;
 };

src/OpenGL/compiler/preprocessor/Preprocessor.h

@@ -17,6 +17,8 @@
 
 #include "pp_utils.h"
 
+#include <cstddef>
+
 namespace pp
 {
 

src/OpenGL/compiler/preprocessor/numeric_lex.h

@@ -18,6 +18,7 @@
 #define COMPILER_PREPROCESSOR_NUMERIC_LEX_H_
 
 #include <sstream>
+#include <cmath>
 
 namespace pp {