am 46d8f384: am 672f8367: Merge "Revert "Add implicit null and stack checks for x86""

* commit '46d8f384241a8401d99e8e921a6b98c26684ebfa':