Merge "Revert^2 "Harmony: Change Mock build""