tree da15f3c49b06a255595c0f3381c641249f24853e
parent b18ddaff10013b068327a3aa468274bbbddcba69
parent c89a32e2ce9e165423a632388513f8c972cdbdbb
author Adam Vartanian <flooey@google.com> 1489658339 +0000
committer Adam Vartanian <flooey@google.com> 1489740728 +0000

Merge upstream-master into master.

This is just the upstream code, the Android-specific files like
README.version will come in a followup change.

Bug: 31182886
Test: None
Change-Id: I85e69e914b2e05131d9db8f22f3ab3de69942ad4