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

Change-Id: I2b50adaa9ed052cf3022a78a77729c3b618834f8