am 7aba65bb: merge from froyo-plus-aosp

Merge commit '7aba65bb2b38ade61f5edd4d9f92c58953505ed1'

* commit '7aba65bb2b38ade61f5edd4d9f92c58953505ed1':
  Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"