Android 4.2.2 release 1.1
resolved conflicts for merge of b7415560 to jb-mr1-dev

Change-Id: I74a2c85a5d00e9e18a1b41753be92b1c4eef39c6
tree: 5262411d344ae7c2bdcd08c1a504517d23a00484
  1. dynamic_annotations/
  2. main/
  3. tsan/
  4. unittest/
  5. Android.mk