Merge pull request #7365 from riking/android-code-style Update Android code style file to better match C/C++ code style
