Merge "Revert "vsoc_x86_64 also has "overriding commands" warnings on master""
am: d60b622604

Change-Id: I4125dbe41d4288a5c41cdee211c573bad78a972f