Merge branch 'expected_upstream' into aosp/master

Only expected_upstream tools update

Test: n/a
Change-Id: Ia4e5b11761246fd08b9deae5604056dc3ffb336b