am dc04cc89: am 0706e6a4: Merge change I485df382 into eclair

Merge commit 'dc04cc892abfbd1405a44c90f3cbd72c7e040bd3' into eclair-mr2-plus-aosp

* commit 'dc04cc892abfbd1405a44c90f3cbd72c7e040bd3':
  Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.