Import external/python/markupsafe into master

Merge branch 'upstream-master' of sso://googleplex-android/platform/external/python/markupsafe

Third-party review: ag/12415762
Bug: 165703675

Change-Id: Id1e1cc64feccc247be68dc1caa7ebebb76a5f607