fixed untracked files
add android code style
Merge remote-tracking branch 'origin/master'