am: de9e40ce * commit 'de9e40ce': migrate tests to AndroidJUnitRunner Change-Id: I94b4762a3b1902183983f8ece03a4a3f2112f088