Merge "adb: add a way to make the server intentionally leak." am: 9e3f6dbf76
am: f10f25db60

Change-Id: I2f27b341ebceccefbc055c8b98dd14526767baff