am d40c93f6: Merge "Add dependency generation to Aapt for R.java"

* commit 'd40c93f61ca5b3f2351b8db716f67b58f1625e85':
  Add dependency generation to Aapt for R.java