am 0d909f54: resolved conflicts for merge of b7415560 to jb-mr1-dev

* commit '0d909f54d46a5c4e5143a0469f77472673fdd06a':
  Clean up handling of multiple architectures in valgrind makefiles.
tree: d6becc01cda4726097a1cea2500974904fbd62da
  1. dynamic_annotations/
  2. main/
  3. tsan/
  4. unittest/
  5. Android.mk