RFR: Merge jdk:master [v2]

[J. Duke]

> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch `jdk:master`that can **not** be merged into the branch `master`:
> 
> The following files contains merge conflicts:
> 
> - src/hotspot/os/bsd/os_perf_bsd.cpp
> - src/hotspot/share/nmt/memMapPrinter.cpp
> 
> All Committers in this [project](https://openjdk.org/census#mobile) have access to my [personal fork](https://github.com/openjdk-bots/mobile) and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
> The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
> The below commands should be run in a local clone of your [personal fork](https://wiki.openjdk.org/display/skara#Skara-Personalforks) of the [openjdk/mobile](https://github.com/openjdk/mobile) repository.
> 
> 
> # Ensure target branch is up to date
> $ git checkout master
> $ git pull https://github.com/openjdk/mobile.git master
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bots/mobile.git +7:openjdk-bot-7
> $ git checkout openjdk-bot-7
> 
> # Merge the target branch
> $ git merge master
> 
> 
> When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create a merge commit:
> 
> 
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge jdk:master'
> 
> 
> 
> When you have created the merge commit, run the following command to push the merge commit to this pull request:
> 
> 
> $ git push https://github.com/openjdk-bots/mobile.git openjdk-bot-7:7
> 
> 
> _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
> 
> Thanks,
> J. Duke

J. Duke has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 11932 additional commits since the last revision:

 - Merge jdk:master
 - Automatic merge of jdk:master into master
 - Automatic merge of jdk:master into master
 - Automatic merge of jdk:master into master
 - Automatic merge of jdk:master into master
 - Automatic merge of jdk:master into master
 - Automatic merge of jdk:master into master
 - Automatic merge of jdk:master into master
 - Automatic merge of jdk:master into master
 - Automatic merge of jdk:master into master
 - ... and 11922 more: https://git.openjdk.org/mobile/compare/c33c1cfe...2fcf7077

-------------

Changes:
  - all: https://git.openjdk.org/mobile/pull/33/files
  - new: https://git.openjdk.org/mobile/pull/33/files/c33c1cfe..2fcf7077

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=mobile&pr=33&range=01
 - incr: https://webrevs.openjdk.org/?repo=mobile&pr=33&range=00-01

  Stats: 176 lines in 41 files changed: 147 ins; 0 del; 29 mod
  Patch: https://git.openjdk.org/mobile/pull/33.diff
  Fetch: git fetch https://git.openjdk.org/mobile.git pull/33/head:pull/33

PR: https://git.openjdk.org/mobile/pull/33