Merge "Speed up needlessly slow libcore CTS tests"