Revert "Harmony: Change Mock build"

This reverts commit 6c0ea5e6e8c042dce3a7ac529354d18fedc3f894.

Reason for revert: breaks on restricted manifests

Bug: 116674705
Change-Id: I71d501dccc17aae6be4523695a66309240076d69
4 files changed