Merge "Disable sanitizer entirely in ResourceTypes.cpp"
am: f7c56624c7

Change-Id: I1843878f7194696896700572f2259f5f2c6b92c2