Merge "Code cleanup and simplification of build_4x4uvmvs function." into experimental