am df8c72e5: am d7ff139f: Merge "Remove bogus extra alignment from sbrk."

# Via Android Git Automerger (1) and others
* commit 'df8c72e510ae9d0a9970a31555ea51ea0c8f19ca':
  Remove bogus extra alignment from sbrk.