am 6534e6d1: (-s ours) Merge "Apply Android-specific patches to Valgrind 3.8.1"

# Via Ben Cheng (1) and Gerrit Code Review (1)
* commit '6534e6d172e6d95cd33467076246734df25b6c5f':
  Apply Android-specific patches to Valgrind 3.8.1