[android] Review fixes
[android] Code reformatting