Merge commit '050ebf4' into honggfuzz-android