Merge "Cosmetic fixes and style fixes"

...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/additional_proximity_chars.cpp

native/jni/src/additional_proximity_chars.h

native/jni/src/basechars.cpp

native/jni/src/bigram_dictionary.cpp

native/jni/src/bigram_dictionary.h

native/jni/src/binary_format.h

native/jni/src/bloom_filter.h

native/jni/src/char_utils.cpp

native/jni/src/char_utils.h

native/jni/src/correction.cpp

native/jni/src/correction.h

native/jni/src/correction_state.h