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

* commit '3e22247e27de9586175c45969c8675e321ce5813':
  Remove unneeded aapt dependency

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build