Merge "Move FMQ benchmark/test services to hardware/interfaces" am: 178250d254 am: c35f1e7bc1
am: add0d3c8b8

Change-Id: I002bb4119971877061921bb260238c6dc2568fca