Merge "Fix missing dependency on R.java"