add junit
add mock_android
Merge branch 'branch_b' into branch_a