Merge "adb: add a way to make the server intentionally leak."
am: 1ac7150590

Change-Id: I4765b5726985555c5c7b325da2b779c7f1687dc0