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

Change-Id: I69af6b72277b8acf3da853713fc9fc195941a33a