Merge "fmq_test using static passthrough libs" am: 4e5a2a5a92 am: 0a4676d0dd
am: 9a97c5fe90

Change-Id: I0e1c8c796374d544a149d7eb32cb1e2a5db51152