Merge "Revert "Harmony: Change Mock build""