Android O MR1 Preview 1
Fix FMQ benchmark test.
am: e726201ea6

Change-Id: Ie77e892754d0365b47a40d5df79fc1917267101e