Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 am: ec69bd0aa3 am: 36bcc913f7
am: 78a3d9dab4

Change-Id: I421bf706b51fb657855dbc71a13919982e70fd44