Merge "Change package for FMQ benchmarks"
am: 97b1bca91c

Change-Id: I50a4de8c8b19bc40725d552f668a5176a3c9909e