am 5127626b: am 3133a4a2: am 0fdf0dc7: Merge "Refactor makefile."

* commit '5127626b4a7d998a75d366bf1128be91c6047dc0':
  Refactor makefile.