Merge "Enforce 64-bit build environment" into gingerbread