Merge "Remove OS_PATH_SEPARATOR from AndroidConfig.h."