Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  Add SingletonContext.Eval to evaluate ninja strings
  Fix package names for executables.
  walkDeps: Fixed bug on non-walked, visited deps.

Change-Id: I2275a46db0e5f0c00bbcc86be13f65660e5f296b