am b61009d9: Merge "Simplify makefile."

* commit 'b61009d97029003bd9f2eed34bfba92b1c3555b0':
  Simplify makefile.