Merge changes from topic 'kill_debuggerd'
am: cfb19e3ac8

Change-Id: I805db402362fd2d9822e3aaa0ed004431fccfd79