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

Change-Id: Ieb9be6913a4c42bff64a6d249c3b232cc7e2008d