Merge "Add <interface> / <instance> to fwk compat mat" into oc-dev
am: 0fefa392f7

Change-Id: I4f698299be7e3b4fdf94aa5497c9eb748c419e45