Merge "Use __builtin_trap to force crashing"
am: 5c030d3c25

Change-Id: I212f11bea0037d1d9e100445fedc726ce031f9c0