Merge "Relax the constraint of 64bit build environment." into gingerbread