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

Change-Id: I7bb5aa7967d439ad3021b4bf4f79f5b4a4f1acf9