Merge "Fix missing dependency on R.java" am: 227a176508
am: bfd4422060

Change-Id: I2090c1f16e77164d82d4e4f99f478315a81f0fc3