Merge "Disable sanitizer entirely in ResourceTypes.cpp" am: f7c56624c7 am: 203055b322
am: 6637d85f4a  -s ours

Change-Id: I46acecdf92bc1245db338ce9f7f06fdf12385bdf