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

Change-Id: I29e411c3c53fd608ea21a0fc136eb0eb1ec8e1a4