fix some problems raised by Dave's code review
Merge branch 'contextCollector'

Conflicts:
	android/src/com/mobiperf/Checkin.java
Merged and resolve conflict