diff --git a/android/src/main/java/com/lwansbrough/RCTCamera/MutableImage.java b/android/src/main/java/com/lwansbrough/RCTCamera/MutableImage.java
index 3053674bb..dda1783f7 100644
--- a/android/src/main/java/com/lwansbrough/RCTCamera/MutableImage.java
+++ b/android/src/main/java/com/lwansbrough/RCTCamera/MutableImage.java
@@ -1,10 +1,9 @@
 package com.lwansbrough.RCTCamera;
 
-import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
-import android.media.ExifInterface;
+import android.support.media.ExifInterface;
 import android.util.Base64;
 import android.util.Log;
 
diff --git a/android/src/main/java/org/reactnative/camera/RNCameraView.java b/android/src/main/java/org/reactnative/camera/RNCameraView.java
index 6b2acb380..12ab505c0 100644
--- a/android/src/main/java/org/reactnative/camera/RNCameraView.java
+++ b/android/src/main/java/org/reactnative/camera/RNCameraView.java
@@ -1,6 +1,7 @@
 package org.reactnative.camera;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.media.CamcorderProfile;
@@ -186,6 +187,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
     preview.layout(paddingX, paddingY, correctWidth + paddingX, correctHeight + paddingY);
   }
 
+  @SuppressLint("all")
   @Override
   public void requestLayout() {
     // React handles this for us, so we don't need to call super.requestLayout();
diff --git a/android/src/main/java/org/reactnative/facedetector/tasks/FileFaceDetectionAsyncTask.java b/android/src/main/java/org/reactnative/facedetector/tasks/FileFaceDetectionAsyncTask.java
index 73ce1e696..b7c431ae4 100644
--- a/android/src/main/java/org/reactnative/facedetector/tasks/FileFaceDetectionAsyncTask.java
+++ b/android/src/main/java/org/reactnative/facedetector/tasks/FileFaceDetectionAsyncTask.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.media.ExifInterface;
+import android.support.media.ExifInterface;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.util.Log;