Revert "Revert "Moving to common compatibility utils.""
This reverts commit 992b459293c4dcae2a12cdf5923e3e26a476bd1a.
This change includes the fix which caused the build breakage which
caused the revert this is reverting.
bug: 21762834
Change-Id: I1df495ba219208b07a7d7c8ac99d2890052caf69
diff --git a/tools/utils/VogarUtils.java b/tools/utils/VogarUtils.java
index 8e77e7c..77c62da 100644
--- a/tools/utils/VogarUtils.java
+++ b/tools/utils/VogarUtils.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-import com.android.cts.util.AbiUtils;
-
import vogar.Expectation;
import vogar.ExpectationStore;
import vogar.ModeId;
import vogar.Result;
+import com.android.compatibility.common.util.AbiUtils;
+
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;