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

Change-Id: Id6a189c562a5b45c309ca1c7dde793157a7939c1