am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when...

am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo

Merge commit '9a5fcd1c' into gingerbread-plus-aosp

* commit '9a5fcd1c':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.