tosulliv: compilation fixes to JUnit test cases to reflect SL 2.0
updates to android app codebase