Merge "Revert "Harmony: Change Mock build"" am: 8ca08f5cac am: 45ee586d2c
am: 08e23d1bb3

Change-Id: Ia61edd52c26cfe9c0bbfef37432865496c45e14c