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

Change-Id: I4ef3f1f632906120810f8ab6b6ec65525cebf4f2