Merge "Fix exception in MakeFileParser" am: 85fad37aa7
am: 65ce0716fc

* commit '65ce0716fcd4c202278aaadc8269962844c8015f':
  Fix exception in MakeFileParser