Reconcile with jb-release

Change-Id: I125444a6ba86b3c91624ea21049373556374b623
tree: 351ba8238c80234f198ab8bd3d0f00e6c0741acd
  1. dynamic_annotations/
  2. main/
  3. tsan/
  4. unittest/
  5. Android.mk