tree 109c8b0b82b0229c14b035058fa630f11b403d49
parent 2fe751e2554970ea86d60cb124e9d42198c310dc
parent 5e683e8a4cae72e18b102e86776bbf7b4b3d00aa
author Mike Aizatsky <aizatsky@chromium.org> 1481148253 +0000
committer android-build-merger <android-build-merger@google.com> 1481148253 +0000

[ossfuzz] catching up with upstream changes am: abb7a18cbd am: be4ffac51a am: 29b86236a6
am: 5e683e8a4c

Change-Id: Ieb33e4c449e2c41cec845c500ab391dac2bd6ba7