Merge "Include asan options from data partition." am: 5d89e6c7fe
am: 725fa57109

Change-Id: I57eddf490a619c843770ed8ae278afdc81ab7d9d