Merge \\"adb: add test for SIGHUP behavior.\\" am: a355dd6110
am: 05f889dd4e

Change-Id: I7ea1f3071fbf0f8a5dd83173c62566e08b3c2503