Merge remote-tracking branch 'aosp/upstream' into master

*   e8a09f95 Merge pull request #141 from colincross/fs
|\
| * b519a7e1 Add globbing to filesystem mocking
|/
* 2eeb7ee1 Merge pull request #140 from danw/sort_tests
* 61caa240 Sort testcases to make build (more) reproducible

Test: soong tests