Merge "LockAgent: Add crasher binary" am: a6874fccb6 am: 6c3f50dc6d
am: 5b72cd1af6

Change-Id: Ib893970f715032d739a35f013091e56b674fe9b8