am 99d98c30: am d12b5ea2: Merge "Add jsr166 tests to cts. Also clean up other...
am 99d98c30: am d12b5ea2: Merge "Add jsr166 tests to cts. Also clean up other mk files, by removing extraneous if statement. Bug: 10390711"
* commit '99d98c30':
Add jsr166 tests to cts. Also clean up other mk files, by removing extraneous if statement. Bug: 10390711