tree 685f71c814bd1ac041b8da85d4dbd4580735b717
parent abdf3b93b6e07ae54789c858475b1c7da7d906d2
parent 78506ddf1a2bd8b6c9e84eb2e0c6ab92719d2716
author Tao Bao <tbao@google.com> 1569983280 -0700
committer android-build-merger <android-build-merger@google.com> 1569983280 -0700

Merge "otautil: Drop a few unneeded includes." am: 36f72131ff am: 7f9eb2e012
am: 78506ddf1a

Change-Id: I37d895c5d35fb9c9435e5bed838c524fb0fa0f17