Android: final pass, style and comments

Change-Id: Ic89e68dfa8a884fc4a6f97096d6960a7c4de2df3