Merge "create a separate lib for jsr166. Bug: 10390711"