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

Change-Id: Iec4b54a1df71417756459c720a26dd5ea1dc664c