Merge tools/ changes from aosp/expected_upstream

Test: n/a
Change-Id: I08a0bfa75c11e3ec1f67a4e2fe39624b72befef4