Don't reset CM_BUILDTYPE

Change-Id: If8f48c29ba710e053ea60f6795281951782955fa