Merge "Move common 32/64 bits product settings to another files" into oc-mr1-dev