Merge changes from topic 'ese vintf'

* changes:
  Add OemLock to the compatibility matrix.
  Add Weaver to the compatibility matrix.