[android] Remove commented code - fix styling