Move bigram_dictionary

Change-Id: I2c243ac75bc02b912f6b0fabedd372148adf8076

native/jni/Android.mk

@@ -46,7 +46,6 @@ LATIN_IME_JNI_SRC_FILES := \
     jni_common.cpp
 
 LATIN_IME_CORE_SRC_FILES := \
-    bigram_dictionary.cpp \
     correction.cpp \
     dic_traverse_wrapper.cpp \
     unigram_dictionary.cpp \
@@ -57,6 +56,7 @@ LATIN_IME_CORE_SRC_FILES := \
         dic_node_utils.cpp \
         dic_nodes_cache.cpp) \
     $(addprefix suggest/core/dictionary/, \
+        bigram_dictionary.cpp \
         binary_dictionary_format.cpp \
         byte_array_utils.cpp \
         dictionary.cpp \

native/jni/src/suggest/core/dictionary/dictionary.cpp

@@ -21,9 +21,9 @@
 #include <map> // TODO: remove
 #include <stdint.h>
 
-#include "bigram_dictionary.h"
 #include "defines.h"
 #include "dic_traverse_wrapper.h"
+#include "suggest/core/dictionary/bigram_dictionary.h"
 #include "suggest/core/dictionary/binary_format.h"
 #include "suggest/core/suggest.h"
 #include "suggest/core/suggest_options.h"