Merge "Fix exception in MakeFileParser"
am: 85fad37aa7

* commit '85fad37aa7ff73341006cbb890eb80a4c5144694':
  Fix exception in MakeFileParser