Merge "Add MCL_ONFAULT to mlockall"
am: ccb9960beb

Change-Id: Icef5d96370340e2d69b58327b26acb1562841518