Merge "Harmony: Change Mock build"
am: 750ddd1393

Change-Id: I694421583f0c2a4e1438cdfbb83d436e87592cd0