am d717f86a: (-s ours) am 64c30a79: am 084c00b8: Merge "init: add LOCAL_SANITIZE := integer"

* commit 'd717f86a3ed9bf0878ce67c176755f656cec29c2':