Merge "Make libcore tests pass on MTS on S devices"