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

Change-Id: I2f27b341ebceccefbc055c8b98dd14526767baff