Merge "Revert "Adapt to google::protobuf::uint64 type change""
am: 4d16ee4f10

Change-Id: Ida7f1eec76819f0703bf2e05cb081a39bbe2ff78
diff --git a/media/libmediaplayer2/nuplayer2/Android.bp b/media/libmediaplayer2/nuplayer2/Android.bp
index 4906a36..c8ddc11 100644
--- a/media/libmediaplayer2/nuplayer2/Android.bp
+++ b/media/libmediaplayer2/nuplayer2/Android.bp
@@ -33,8 +33,6 @@
     cflags: [
         "-Werror",
         "-Wall",
-        // Allow implicit fallthroughs in NuPlayer2Driver.cpp until they are fixed.
-        "-Wno-error=implicit-fallthrough",
     ],
 
     product_variables: {