Merge "Harmony: Change Mock build"