Merge "Revert^2 "Move kVRegSize to globals.h to reduce include dependencies.""
am: 518fcc50fa

Change-Id: I7f40fcd69aa3c226881f79757ea19fe6f05f36c0