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

Change-Id: I3868e11d968d9e7c1c265d89c6991d500fc6b968