upgrade Android dependencies and junit 4.12