Remove use of junit.framework.Assert in non-test code
am: 2728397759

Change-Id: I8ef4657f4c7ed65151e650bd7b499c530f975aa8