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

* commit 'a534d5004e8ef8bfab280b3027b6bb9934da8a31':
  create a separate lib for jsr166. Bug: 10390711