am 5aaa669b: Merge remote-tracking branch \'aosp/upstream\'

* commit '5aaa669beb3adefb167012ee6b66e476c8441723':
  Add a test runner
  Fix bugs related to local vs. inherited variables