Merge "Fix weak vtable warnings"
am: d93a40c920

Change-Id: I54d2cad55131ac3a8786012d692d4627f188a0a7