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

Change-Id: I63e2754a278e3acb5aaa9a6a6d94dc4174a5e8b4