Merge tag 'android-security-10.0.0_r53' into int/10/fp2

Android security 10.0.0 release 53

* tag 'android-security-10.0.0_r53':
  audio_utils: test SPDIFEncoder
  spdif: fix possible buffer overflow

Change-Id: Ib5155d3053c587486a1a4000f3ceb51eaf9cba0a
diff --git a/camera/Android.bp b/camera/Android.bp
index 38e3f2f..fe0b3b4 100644
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -28,7 +28,7 @@
     ],
 
     product_variables: {
-        debuggable: {
+        eng: {
             // Enable assert()
             cflags: [
                 "-UNDEBUG",