Reconcile with jb-release

Change-Id: I844298c1774f33c14b2cab56fa9f8ba23485faaf
tree: 70f28ae807a4824f64422b82061dbe5c3861f82a
  1. dynamic_annotations/
  2. main/
  3. tsan/
  4. unittest/
  5. Android.mk