am bb465da6: Reconcile with jb-release

* commit 'bb465da6b00259e4da760046a675d6bac276ea7e':
tree: 351ba8238c80234f198ab8bd3d0f00e6c0741acd
  1. dynamic_annotations/
  2. main/
  3. tsan/
  4. unittest/
  5. Android.mk