Merge "Add dependency generation to Aapt for R.java"