am: 179492c8 * commit '179492c8': Do not use EXPECT_DEATH in unit test, fails on device. Change-Id: I3acf2db686a86ee744eb20efaaf3f7366a4113d9