Merge branch '0.9.2' into 0.9.3

glm/core/func_common.inl

@@ -800,6 +800,8 @@ namespace detail
 
 #if(GLM_COMPILER & GLM_COMPILER_VC)
 		return typename genType::bool_type(_isnan(x));
+#elif(defined(ANDROID))
+		return typename genType::bool_type(isnan(x));
 #else
 		return typename genType::bool_type(std::isnan(x));
 #endif
@@ -851,6 +853,8 @@ namespace detail
 
 #if(GLM_COMPILER & GLM_COMPILER_VC)
 		return typename genType::bool_type(_fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF);
+#elif(defined(ANDROID))
+		return typename genType::bool_type(isinf(x));
 #else
 		return typename genType::bool_type(std::isinf(x));
 #endif