Merge "Fix fuzzer builds [#3]." into qt-dev-plus-aosp
am: dcacc670a1

Change-Id: I58827125032aecc67023e8d3b0fbe47b3d8dad59