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

* commit '3133a4a20395032c7d5270516bbdacf58c6bbc78':
  Refactor makefile.