am 617f435b: am 8d778522: am 61f172cd: Merge "Simplify and speed up makefile."

* commit '617f435b7decc07c3721b45edb0f4e7c4c2e54a5':
  Simplify and speed up makefile.