diff --git a/Android.bp b/Android.bp
index 148dac3..1a61a69 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,5 @@
 cc_library_static {
-    name: "libia_xaacdec",
+    name: "libxaacdec",
 
     vendor_available: true,
     vndk: {
@@ -130,28 +130,25 @@ cc_library_static {
         "decoder/drc_src/impd_drc_static_payload.c",
     ],
 
-	sanitize: {
+    sanitize: {
         misc_undefined: [
             "unsigned-integer-overflow",
             "signed-integer-overflow",
         ],
         cfi: true,
-        diag: {
-            cfi: true,
-        },
     },
+
     arch: {
         arm: {
             local_include_dirs: [
                 "decoder/armv7",
-				"decoder"
+		"decoder"
             ],
 
             srcs: [
                 "decoder/armv7/ixheaacd_qmf_dec.c",
                 "decoder/armv7/ixheaacd_fft_armv7.c",
                 "decoder/armv7/ixheaacd_function_selector_armv7.c",
-				
                 "decoder/armv7/ixheaacd_overlap_add1.s",
                 "decoder/armv7/ixheaacd_overlap_add2.s",
                 "decoder/armv7/ixheaacd_lap1.s",
@@ -165,7 +162,7 @@ cc_library_static {
                 "decoder/armv7/ixheaacd_cos_sin_mod.s",
                 "decoder/armv7/ixheaacd_dct3_32.s",
                 "decoder/armv7/ixheaacd_decorr_filter2.s",
-				"decoder/armv7/ixheaacd_enery_calc_per_subband.s",
+		"decoder/armv7/ixheaacd_enery_calc_per_subband.s",
                 "decoder/armv7/ixheaacd_expsubbandsamples.s",
                 "decoder/armv7/ixheaacd_ffr_divide16.s",
                 "decoder/armv7/ixheaacd_fwd_modulation.s",
@@ -186,13 +183,13 @@ cc_library_static {
                 "decoder/armv7/ixheaacd_shiftrountine.s",
                 "decoder/armv7/ixheaacd_shiftrountine_with_round.s",
                 "decoder/armv7/ixheaacd_tns_ar_filter_fixed_32x16.s",
-				"decoder/armv7/ixheaacd_tns_parcor2lpc_32x16.s",
+		"decoder/armv7/ixheaacd_tns_parcor2lpc_32x16.s",
                 "decoder/armv7/ixheaacd_esbr_radix4bfly.s",
                 "decoder/armv7/ixheaacd_esbr_cos_sin_mod_loop1.s",
                 "decoder/armv7/ixheaacd_esbr_qmfsyn64_winadd.s",
                 "decoder/armv7/ixheaacd_complex_ifft_p2.s",
                 "decoder/armv7/ixheaacd_complex_fft_p2.s",
-				"decoder/armv7/ixheaacd_esbr_cos_sin_mod_loop2.s",
+		"decoder/armv7/ixheaacd_esbr_cos_sin_mod_loop2.s",
                 "decoder/armv7/ixheaacd_shiftrountine_with_round_hq.s",
                 "decoder/armv7/ixheaacd_mps_complex_fft_64_asm.s",
                 "decoder/armv7/ixheaacd_esbr_fwd_modulation.s",
@@ -202,13 +199,13 @@ cc_library_static {
                 "decoder/armv7/ixheaacd_calc_post_twid.s",
                 "decoder/armv7/ixheaacd_mps_synt_out_calc.s",
                 "decoder/armv7/ixheaacd_mps_synt_post_fft_twiddle.s",
-				"decoder/armv7/ixheaacd_sbr_qmfanal32_winadds_eld.s",
-				"decoder/armv7/ixheaacd_shiftrountine_with_rnd_eld.s",
-				"decoder/armv7/ixheaacd_eld_decoder_sbr_pre_twiddle.s",
-				"decoder/armv7/ixheaacd_fft_15_ld.s",
-				"decoder/armv7/ixheaacd_aac_ld_dec_rearrange.s",
-				"decoder/armv7/ixheaacd_fft32x32_ld2_armv7.s",
-				"decoder/armv7/ixheaacd_apply_scale_fac.s"	
+		"decoder/armv7/ixheaacd_sbr_qmfanal32_winadds_eld.s",
+		"decoder/armv7/ixheaacd_shiftrountine_with_rnd_eld.s",
+		"decoder/armv7/ixheaacd_eld_decoder_sbr_pre_twiddle.s",
+		"decoder/armv7/ixheaacd_fft_15_ld.s",
+		"decoder/armv7/ixheaacd_aac_ld_dec_rearrange.s",
+		"decoder/armv7/ixheaacd_fft32x32_ld2_armv7.s",
+		"decoder/armv7/ixheaacd_apply_scale_fac.s"
             ],
 
             cflags: [
@@ -248,15 +245,15 @@ cc_library_static {
                 "decoder/armv8/ixheaacd_sbr_qmfsyn64_winadd.s",
                 "decoder/armv8/ixheaacd_overlap_add1.s",
                 "decoder/armv8/ixheaacd_overlap_add2.s",
-				"decoder/armv8/ixheaacd_shiftrountine_with_round_eld.s",
-				"decoder/armv8/ixheaacd_fft32x32_ld2_armv8.s",
-				"decoder/armv8/ixheaacd_inv_dit_fft_8pt.s",
-				"decoder/armv8/ixheaacd_shiftrountine_with_round.s",
-				"decoder/armv8/ixheaacd_sbr_qmf_analysis32_neon.s",
-				"decoder/armv8/ixheaacd_postradixcompute4.s",
-				"decoder/armv8/ixheaacd_apply_scale_factors.s",				
-				"decoder/armv8/ixheaacd_cos_sin_mod_loop1.s",				
-				"decoder/armv8/ixheaacd_cos_sin_mod_loop2.s",				
+		"decoder/armv8/ixheaacd_shiftrountine_with_round_eld.s",
+		"decoder/armv8/ixheaacd_fft32x32_ld2_armv8.s",
+		"decoder/armv8/ixheaacd_inv_dit_fft_8pt.s",
+		"decoder/armv8/ixheaacd_shiftrountine_with_round.s",
+		"decoder/armv8/ixheaacd_sbr_qmf_analysis32_neon.s",
+		"decoder/armv8/ixheaacd_postradixcompute4.s",
+		"decoder/armv8/ixheaacd_apply_scale_factors.s",
+		"decoder/armv8/ixheaacd_cos_sin_mod_loop1.s",
+		"decoder/armv8/ixheaacd_cos_sin_mod_loop2.s",
             ],
         },
 
@@ -266,7 +263,7 @@ cc_library_static {
             ],
 
             srcs: [
-                "decoder/ixheaacd_qmf_dec.c",			
+                "decoder/ixheaacd_qmf_dec.c",
                 "decoder/x86/ixheaacd_function_selector_x86.c",
             ],
 
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..3da5c7a
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+marcone@google.com
+essick@google.com
+lajos@google.com