am f3fc5a6d: resolved conflicts for merge of e19f2b00 to lmp-dev-plus-aosp

* commit 'f3fc5a6d29cf7cadc0ac1bd4567042aac27ec543':
  Set vtable in class object to null after linking.