Merge changes from topic "31.0_compat_mapping"

* changes:
  Add 31.0 mapping files
  Add fake 31.0 prebuilt