A patch against your current ToT that builds in AOSP master.
Whitespace/code style.
As long as Android's going to require fortify, fixup the warnings it generates.