am 73a2a902: Merge "Remove unneeded aapt dependency"

* commit '73a2a9028f6feae81a2734e0dd4bdc4e13f66efd':
  Remove unneeded aapt dependency