Merge "Fix wrong package names in cts-reference-aosp" into oc-dev