Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp