am 3066591a: am 1deb0317: (-s ours) am 51ffedd2: am 1efef4c4: Merge "Revert "init: add LOCAL_SANITIZE := integer""

* commit '3066591a5a7c2d7ed9706cfeb4ca00c17583d6b7':