Merge "Clean up Predicate related code in android.test"