Merge changes from topic 'kill_debuggerd' am: cfb19e3ac8 am: fe6eb8761d am: 53ebeef0fb
am: 280f4eb016

Change-Id: I83a19282b24b0140f9c666779a7f8fb7fcf5ae2b