am 0706e6a4: Merge change I485df382 into eclair

Merge commit '0706e6a4a3e6b80c11aae1648a3876c59929c48f' into eclair-plus-aosp

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