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

Change-Id: Ib65d7e5a6c02653eb9d815d4a0b1536d9fc6cbbe