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

Change-Id: I9d1d89bbeeaed64e2bf28b15c5e2be7ceb270354