am 1b879889: resolved conflicts for merge of 747a9780 to honeycomb-plus-aosp

* commit '1b8798894c90ef5deaf4f49d468e959ea3c19131':
  Build system tweaks for Valgrind.