Merge "adb: add script to trace adbd." am: 963d95d188
am: b4360f4506

Change-Id: Iec2701e5f60af01f53cb710b0c6f0d07d46fd4a2