am 864d4985: (-s ours) am 4d74f2cb: am 0b973da5: Merge "init: add LOCAL_SANITIZE := integer"

* commit '864d4985ed0434974b8d0401dc9c670d186d594a':