am cffed61d: am d479a7a1: Merge "Enable SANITIZE_TARGET."

* commit 'cffed61d2f07e3eea7d2e4f7f5fd337115ca4fd6':
  Enable SANITIZE_TARGET.