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

*   53d43575 Merge pull request #127 from colincross/memprofile
|\
| * 2ecec57e Add support for memory profiling
* b2bee4ee Merge pull request #126 from colincross/errors
* 2c628442 Improve error reporting

Test: build.ninja identical