Merge "Unconditionally test mapping files."