[automerger skipped] Merge "Fix statsd ASAN failure"
am: 12140677ea -s ours
am skip reason: SHA1 12140677ea skipped by user yikong

Change-Id: I7b70255b4556c7105523c892a966ef120fac8d87