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

Merge commit '6082332e4edc66d6e41856969ac8d1c534928541'

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