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

Change-Id: Id08e306054078cd7e2252c3e004334bfc224722f