Fix Junit
Update Android dependencies