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

Change-Id: I71c8386c14d6b2a93445a1a6419fa56945d9a50a