Merge changes I90e10c74,I038d1df4,I4299bd96

* changes:
  adbd: delete unused variable.
  adb: move things around to prepare to add LZ4.
  adb: fix misindentation in Android.bp