Upgrade to JUnit 4.12
am: aeb93fc33c

Change-Id: I205b644f99ff5da426794918c85007de19bcb25d