am cedbd2f5: (-s ours) am eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread

* commit 'cedbd2f587f894647ab5bf3bdd200ee78c673881':
  add ANDROID_HOST_OUT to env (please do not merge)