Merge "Add MCL_ONFAULT to mlockall" am: ccb9960beb
am: 179c81f733

Change-Id: Iae5a52528102bd3c19c3cc9eff661130d1e35c92