tree 0f4bb95d9aba4a754c4b64e357f4045a538664da
parent 545e0e29a11eee6646d8b0d112c9875b31aa4490
author Dan Albert <danalbert@google.com> 1518053042 -0800
committer Dan Albert <danalbert@google.com> 1518053042 -0800

Adapt to upstream changes.

Test: make checkbuild
Bug: None
Change-Id: Idf57f13494b2e14b12dbd19a220d45d79d54d692