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

Change-Id: Ie91b75225023f9154e947af96561728403728dd1