Merge "Disable VT on shamu." into mnc-dev