Bug: 32284445 Test: Built and ran FMQ benchmarks Change-Id: Ia6bacf21d276b55e4e590dc96f348464f2098992