Merge remote-tracking branch 'aosp/upstream'

There are three feature changes

https://github.com/danw/kati/commit/0b544c58579cf2214d
https://github.com/google/kati/commit/348a960f31d42c63
https://github.com/google/kati/commit/422179d6ddbf649a

Other changes are minor performance optimizations. ~1.5x faster
ninja generation overall.

Bug: 27225198
Change-Id: I686cf4357a8c25c14ecbdbc75cedcd6db61eec7b