android: clean-up and some refactoring in java code.

Change-Id: I78cadb0b71bcb65a55006bf52cfe3e6cda891a38
6 files changed