Merge "Misc cleanups" into jb-mr1-dev

...ve/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp

native/jni/com_android_inputmethod_keyboard_ProximityInfo.h

...ve/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

native/jni/com_android_inputmethod_latin_BinaryDictionary.h

native/jni/com_android_inputmethod_latin_NativeUtils.cpp

native/jni/com_android_inputmethod_latin_NativeUtils.h

native/jni/jni_common.cpp

native/jni/jni_common.h

native/jni/src/bigram_dictionary.cpp

native/jni/src/debug.h

native/jni/src/defines.h

native/jni/src/dictionary.cpp

native/jni/src/unigram_dictionary.cpp