Merge remote branch 'goog/froyo' into mm
Make adb's daemon-port on the host machine configurable.

This is the first CL of a somewhat larger effort which, among other things,
will involve changing the emulator and ddms to talk to adb running on a
configurable port.

The port can be configured using environment variable ANDROID_ADB_PORT.

Further CLs will also address the set of ports used for the local transport.

Change-Id: I8082ee10ce504dab1cf89fe6d189eccf43ce9cf4
Fix a long standing  bug in the output buffer size computation.

Change-Id: I55aca04fdd3822ac06db183bf2ff0cbd61f778e8
Merge "Make adb's daemon-port on the host machine configurable."
Revert "Make adb's daemon-port on the host machine configurable."

Fix the build.
This reverts commit 5a00fd1c5542b302e5534d7c424ee92da3d6bceb.
Add a log tag entry for the dalvik lock profiling event.

Change-Id: I4897da78ee6c6b32c8a588ff689c60a59bc60ed7
am a8415325: am 1888de8e: merge from open-source master
am 1ded19f4: fix build
Merge "Add a log tag entry for the dalvik lock profiling event."
Fix adb, fastboot to compile in Windows SDK under Linux.

Change-Id: I3d0e4cabd65d9de17036901a22ec3277a6d58e64
Merge commit '5a00fd1c5542b302e5534d7c424ee92da3d6bceb' into oxygen_4.3

* commit '5a00fd1c5542b302e5534d7c424ee92da3d6bceb':
  Make adb's daemon-port on the host machine configurable.
Merge commit '2a7f2ae7d4b25f89e36be04e47b9e7a3d76e0cfd' into oxygen_4.3

* commit '2a7f2ae7d4b25f89e36be04e47b9e7a3d76e0cfd':
  Fix a long standing  bug in the output buffer size computation.
Merge commit '59ab0c534095afdab0765240a6eaeaad2ab43ab0' into oxygen_4.3

* commit '59ab0c534095afdab0765240a6eaeaad2ab43ab0':
  Revert "Make adb's daemon-port on the host machine configurable."
Merge commit 'c24b4d8cc88c534581b3dd10559a4a2e27410712' into oxygen_4.3

* commit 'c24b4d8cc88c534581b3dd10559a4a2e27410712':
  Add a log tag entry for the dalvik lock profiling event.
Merge commit 'fab167850d751a817c39e074334fe7a0987ce647' into oxygen_4.3

* commit 'fab167850d751a817c39e074334fe7a0987ce647':
  Fix adb, fastboot to compile in Windows SDK under Linux.