am 56433ee2: Merge "Clean up the architecture-specific makefiles."

* commit '56433ee2a2ccc097ac3ad753168722b0fc76f3b1':
  Clean up the architecture-specific makefiles.