am 517daeb6: am 73a2a902: Merge "Remove unneeded aapt dependency"

* commit '517daeb63388d153102d92f93a0c7e772360df83':
  Remove unneeded aapt dependency