Merge "Update vndk list for android.hardware.common.fmq" am: 761f5fe1 am:...

Merge "Update vndk list for android.hardware.common.fmq" am: 761f5fe1 am: 2b37bd99 am: 757b419f am: acd2e142

Original change: https://android-review.googlesource.com/c/platform/build/+/1456139

Change-Id: I8904656590e45b006314fe1e1c673a8045c0ebf1