Merge "fmq_test using static passthrough libs"
am: 4e5a2a5a92

Change-Id: Icecfaa411ccf7dbab42cec6f2580456c80eba26c