Merge "Signature: Fix javac dependencies"