Merge "Fix bionic cts test build bug."