Merge "Revert "Move kVRegSize to globals.h to reduce include dependencies.""
am: 768c6cc3c4

Change-Id: I7b2c2bd147192281ccb8ead6e884d3b19433c3db