Merge "Ensure that android.test tests pass"
am: 156775fea8

Change-Id: I7fe4f45bd98acea016e02b44a4df38f0e907c0e4