Merge "Add jsr166 tests to cts. Also clean up other mk files, by removing extraneous if statement. Bug: 10390711"