Merge "Don't append _asan to non-asan build flavors." am: 1782e17ef2 am: 781469ac0a
am: 5930ad5195

Change-Id: I6f73c3f2f74c8613941331d49bdba6717a220c02