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

Change-Id: I5c299e4050d768514691acfa4d0da5cdfab57823