Snap for 4429331 from 4d9672465da3e5db0ec3cbbad56b188f49a151c5 to sdk-release

Change-Id: I73951c1968016fa4eccce24bde1dd14aa9a5c8e0

141 files changed, 687 insertions, 848 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index b612d92..a616551 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -41,7 +41,7 @@ TARGET_BOOTLOADER_BOARD_NAME := dragon
 TARGET_RELEASETOOLS_EXTENSIONS := device/google/dragon
 
 USE_OPENGL_RENDERER := true
-NUM_FRAMEBUFFER_SURFACE_BUFFERS := 2
+NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 BOARD_DISABLE_TRIPLE_BUFFERED_DISPLAY_SURFACES := true
 BOARD_USES_DRM_HWCOMPOSER := true
 BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER := nvidia-gralloc
@@ -51,6 +51,7 @@ TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888
 PRESENT_TIME_OFFSET_FROM_VSYNC_NS := 0
 VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000
+TARGET_USES_HWC2 := true
 
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3758096384
@@ -73,6 +74,8 @@ BOARD_WIDEVINE_OEMCRYPTO_LEVEL := 1
 
 #TARGET_SUPPORTS_64_BIT_APPS := true
 
+TARGET_FS_CONFIG_GEN += device/google/dragon/config.fs
+
 # Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/google/dragon/bluetooth
 BOARD_HAVE_BLUETOOTH_BCM := true
@@ -103,7 +106,6 @@ ART_USE_HSPACE_COMPACT=true
 BOARD_CHARGER_ENABLE_SUSPEND := true
 
 BOARD_SEPOLICY_DIRS += device/google/dragon/sepolicy
-BOARD_SECCOMP_POLICY += device/google/dragon/seccomp
 
 # add firmware update to the updater binary
 TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_dragon
@@ -114,4 +116,11 @@ ifeq ($(SECURE_OS_BUILD),tlk)
   BOARD_SUPPORT_ROLLBACK_PROTECTION := true
 endif
 
-BOARD_HAL_STATIC_LIBRARIES := libdumpstate.dragon libhealthd.dragon
+BOARD_HAL_STATIC_LIBRARIES := libhealthd.dragon
+
+# Testing related defines
+BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/dragon-setup.sh
+
+# Vendor Interface Manifest
+DEVICE_MANIFEST_FILE := device/google/dragon/manifest.xml
+DEVICE_MATRIX_FILE := device/google/dragon/compatibility_matrix.xml
diff --git a/DragonKeyboard/res/xml/keyboard_layouts.xml b/DragonKeyboard/res/xml/keyboard_layouts.xml
index cf6ed5d..5a0ba63 100644
--- a/DragonKeyboard/res/xml/keyboard_layouts.xml
+++ b/DragonKeyboard/res/xml/keyboard_layouts.xml
@@ -34,7 +34,8 @@
             android:label="@string/keyboard_layout_dragon_english_us_intl_label"
             android:keyboardLayout="@raw/keyboard_layout_dragon_english_us_intl"
             androidprv:vendorId="0x18d1"
-            androidprv:productId="0x5018" />
+            androidprv:productId="0x5018"
+            androidprv:locale="fr-CA" />
     <keyboard-layout android:name="keyboard_layout_dragon_finnish"
             android:label="@string/keyboard_layout_dragon_finnish_label"
             android:keyboardLayout="@raw/keyboard_layout_dragon_swedish"
diff --git a/android_filesystem_config.h b/android_filesystem_config.h
deleted file mode 100644
index 874195f..0000000
--- a/android_filesystem_config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* This file is used to define the properties of the filesystem
-** images generated by build tools (mkbootfs and mkyaffs2image) and
-** by the device side of adb.
-*/
-
-#include <private/android_filesystem_config.h>
-
-#define NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
-/* static const struct fs_path_config android_device_dirs[] = { }; */
-
-/* Rules for files.
-** These rules are applied based on "first match", so they
-** should start with the most specific path and work their
-** way up to the root. Prefixes ending in * denotes wildcard
-** and will allow partial matches.
-*/
-static const struct fs_path_config android_device_files[] = {
-    { 00755, AID_ROOT,      AID_SHELL,     (1ULL << CAP_BLOCK_SUSPEND), "system/bin/glgps" },
-#ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
-    { 00000, AID_ROOT,      AID_ROOT,      0, "system/etc/fs_config_dirs" },
-#endif
-};
diff --git a/audio/hal/audio_hw.c b/audio/hal/audio_hw.c
index 70a9a41..e2faafd 100644
--- a/audio/hal/audio_hw.c
+++ b/audio/hal/audio_hw.c
@@ -1023,12 +1023,7 @@ static ssize_t read_and_process_frames(struct audio_stream_in *stream, void* buf
     ssize_t frames_wr = 0; /* Number of frames actually read */
     size_t bytes_per_sample = audio_bytes_per_sample(stream->common.get_format(&stream->common));
     void *proc_buf_out = buffer;
-#ifdef PREPROCESSING_ENABLED
-    audio_buffer_t in_buf;
-    audio_buffer_t out_buf;
-    int i;
-    bool has_processing = in->num_preprocessors != 0;
-#endif
+
     /* Additional channels might be added on top of main_channels:
     * - aux_channels (by processing effects)
     * - extra channels due to HW limitations
@@ -1037,7 +1032,34 @@ static ssize_t read_and_process_frames(struct audio_stream_in *stream, void* buf
     size_t src_channels = in->config.channels;
     size_t dst_channels = audio_channel_count_from_in_mask(in->main_channels);
     bool channel_remapping_needed = (dst_channels != src_channels);
-    size_t src_buffer_size = frames_num * src_channels * bytes_per_sample;
+    const size_t src_frame_size = src_channels * bytes_per_sample;
+
+#ifdef PREPROCESSING_ENABLED
+    const bool has_processing = in->num_preprocessors != 0;
+#else
+    const bool has_processing = false;
+#endif
+
+    /* With additional channels or processing, we need intermediate buffers */
+    if (channel_remapping_needed || has_processing) {
+        const size_t src_buffer_size = frames_num * src_frame_size;
+
+        if (in->proc_buf_size < src_buffer_size) {
+            in->proc_buf_size = src_buffer_size;
+#ifdef PREPROCESSING_ENABLED
+            /* we always reallocate both buffers in case # of effects change dynamically. */
+            in->proc_buf_in = realloc(in->proc_buf_in, src_buffer_size);
+            ALOG_ASSERT((in->proc_buf_in != NULL),
+                    "process_frames() failed to reallocate proc_buf_in");
+#endif
+            in->proc_buf_out = realloc(in->proc_buf_out, src_buffer_size);
+            ALOG_ASSERT((in->proc_buf_out != NULL),
+                    "process_frames() failed to reallocate proc_buf_out");
+        }
+        if (channel_remapping_needed) {
+            proc_buf_out = in->proc_buf_out;
+        }
+    }
 
 #ifdef PREPROCESSING_ENABLED
     if (has_processing) {
@@ -1046,24 +1068,10 @@ static ssize_t read_and_process_frames(struct audio_stream_in *stream, void* buf
         while (frames_wr < frames_num) {
             /* first reload enough frames at the end of process input buffer */
             if (in->proc_buf_frames < (size_t)frames_num) {
-                ssize_t frames_rd;
-                if (in->proc_buf_size < (size_t)frames_num) {
-                    in->proc_buf_size = (size_t)frames_num;
-                    in->proc_buf_in = realloc(in->proc_buf_in, src_buffer_size);
-                    ALOG_ASSERT((in->proc_buf_in != NULL),
-                                "process_frames() failed to reallocate proc_buf_in");
-                    if (channel_remapping_needed) {
-                        in->proc_buf_out = realloc(in->proc_buf_out, src_buffer_size);
-                        ALOG_ASSERT((in->proc_buf_out != NULL),
-                                    "process_frames() failed to reallocate proc_buf_out");
-                        proc_buf_out = in->proc_buf_out;
-                    }
-                }
-                frames_rd = read_frames(in,
-                                        in->proc_buf_in +
-                                            in->proc_buf_frames * src_channels * bytes_per_sample,
-                                        frames_num - in->proc_buf_frames);
-                  if (frames_rd < 0) {
+                ssize_t frames_rd = read_frames(in,
+                        (char *)in->proc_buf_in + in->proc_buf_frames * src_frame_size,
+                        frames_num - in->proc_buf_frames);
+                if (frames_rd < 0) {
                     /* Return error code */
                     frames_wr = frames_rd;
                     break;
@@ -1073,17 +1081,20 @@ static ssize_t read_and_process_frames(struct audio_stream_in *stream, void* buf
 
              /* in_buf.frameCount and out_buf.frameCount indicate respectively
               * the maximum number of frames to be consumed and produced by process() */
+            audio_buffer_t in_buf;
+            audio_buffer_t out_buf;
+
             in_buf.frameCount = in->proc_buf_frames;
-            in_buf.s16 = in->proc_buf_in;
+            in_buf.s16 = in->proc_buf_in;  /* currently assumes PCM 16 effects */
             out_buf.frameCount = frames_num - frames_wr;
-            out_buf.s16 = (int16_t *)proc_buf_out + frames_wr * in->config.channels;
+            out_buf.s16 = (int16_t *)proc_buf_out + frames_wr * src_channels;
 
             /* FIXME: this works because of current pre processing library implementation that
              * does the actual process only when the last enabled effect process is called.
              * The generic solution is to have an output buffer for each effect and pass it as
              * input to the next.
              */
-            for (i = 0; i < in->num_preprocessors; i++) {
+            for (int i = 0; i < in->num_preprocessors; i++) {
                 (*in->preprocessors[i].effect_itfe)->process(in->preprocessors[i].effect_itfe,
                                                    &in_buf,
                                                    &out_buf);
@@ -1096,8 +1107,8 @@ static ssize_t read_and_process_frames(struct audio_stream_in *stream, void* buf
 
             if (in->proc_buf_frames) {
                 memcpy(in->proc_buf_in,
-                       in->proc_buf_in + in_buf.frameCount * src_channels * bytes_per_sample,
-                       in->proc_buf_frames * in->config.channels * audio_bytes_per_sample(in_get_format(in)));
+                       (char *)in->proc_buf_in + in_buf.frameCount * src_frame_size,
+                       in->proc_buf_frames * src_frame_size);
             }
 
             /* if not enough frames were passed to process(), read more and retry. */
@@ -1120,23 +1131,14 @@ static ssize_t read_and_process_frames(struct audio_stream_in *stream, void* buf
 #endif //PREPROCESSING_ENABLED
     {
         /* No processing effects attached */
-        if (channel_remapping_needed) {
-            /* With additional channels, we cannot use original buffer */
-            if (in->proc_buf_size < src_buffer_size) {
-                in->proc_buf_size = src_buffer_size;
-                in->proc_buf_out = realloc(in->proc_buf_out, src_buffer_size);
-                ALOG_ASSERT((in->proc_buf_out != NULL),
-                            "process_frames() failed to reallocate proc_buf_out");
-            }
-            proc_buf_out = in->proc_buf_out;
-        }
         frames_wr = read_frames(in, proc_buf_out, frames_num);
         ALOG_ASSERT(frames_wr <= frames_num, "read more frames than requested");
     }
 
-    if (channel_remapping_needed) {
+    /* check negative frames_wr (error) before channel remapping to avoid overwriting memory. */
+    if (channel_remapping_needed && frames_wr > 0) {
         size_t ret = adjust_channels(proc_buf_out, src_channels, buffer, dst_channels,
-            bytes_per_sample, frames_wr * src_channels * bytes_per_sample);
+            bytes_per_sample, frames_wr * src_frame_size);
         ALOG_ASSERT(ret == (frames_wr * dst_channels * bytes_per_sample));
     }
 
@@ -1885,8 +1887,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
     struct str_parms *parms;
     char value[32];
     int ret, val = 0;
-    struct audio_usecase *uc_info;
-    bool do_standby = false;
+    bool devices_changed;
     struct pcm_device *pcm_device;
     struct pcm_device_profile *pcm_profile;
 #ifdef PREPROCESSING_ENABLED
@@ -1915,24 +1916,11 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
         }
 #endif
         if (val != 0) {
+            devices_changed = out->devices != (audio_devices_t)val;
             out->devices = val;
 
             if (!out->standby) {
-                uc_info = get_usecase_from_id(adev, out->usecase);
-                if (uc_info == NULL) {
-                    ALOGE("%s: Could not find the usecase (%d) in the list",
-                          __func__, out->usecase);
-                } else {
-                    list_for_each(node, &out->pcm_dev_list) {
-                        pcm_device = node_to_item(node, struct pcm_device, stream_list_node);
-                        if ((pcm_device->pcm_profile->devices & val) == 0)
-                            do_standby = true;
-                        val &= ~pcm_device->pcm_profile->devices;
-                    }
-                    if (val != 0)
-                        do_standby = true;
-                }
-                if (do_standby)
+                if (devices_changed)
                     do_out_standby_l(out);
                 else
                     select_devices(adev, out->usecase);
diff --git a/audio/soundtrigger/sound_trigger_hw.c b/audio/soundtrigger/sound_trigger_hw.c
index 035a5b6..2f76956 100644
--- a/audio/soundtrigger/sound_trigger_hw.c
+++ b/audio/soundtrigger/sound_trigger_hw.c
@@ -228,6 +228,7 @@ static void *callback_thread_loop(void *context)
 
     stdev_dsp_set_power(stdev, 1);
 
+    memset(&config, 0, sizeof(config));
     config.channels = 1;
     config.rate = 16000;
     config.period_size = 240;
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
new file mode 100644
index 0000000..3082485
--- /dev/null
+++ b/compatibility_matrix.xml
@@ -0,0 +1,59 @@
+<compatibility-matrix version="1.0" type="device">
+    <hal format="hidl" optional="false">
+        <name>android.frameworks.schedulerservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>ISchedulingPolicyService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.frameworks.sensorservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>ISensorManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.allocator</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAllocator</name>
+            <instance>ashmem</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.manager</name>
+        <version>1.0</version>
+        <interface>
+            <name>IServiceManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.memory</name>
+        <version>1.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>ashmem</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.token</name>
+        <version>1.0</version>
+        <interface>
+            <name>ITokenManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.system.wifi.keystore</name>
+        <version>1.0</version>
+        <interface>
+            <name>IKeystore</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+
+</compatibility-matrix>
diff --git a/config.fs b/config.fs
new file mode 100644
index 0000000..1893571
--- /dev/null
+++ b/config.fs
@@ -0,0 +1,5 @@
+[system/bin/glgps]
+mode: 0755
+user: AID_ROOT
+group: AID_SHELL
+caps: BLOCK_SUSPEND
diff --git a/crash_collector/coredump_writer.cc b/crash_collector/coredump_writer.cc
index 521f0ea..47fd47e 100644
--- a/crash_collector/coredump_writer.cc
+++ b/crash_collector/coredump_writer.cc
@@ -25,7 +25,7 @@
 
 #include <android-base/file.h>
 #include <android-base/unique_fd.h>
-#include <log/logger.h>
+#include <log/log.h>
 
 // From external/google-breakpad.
 #include "common/linux/elf_core_dump.h"
diff --git a/crash_collector/crash_collector.cc b/crash_collector/crash_collector.cc
index 7cfc7e3..036ceca 100644
--- a/crash_collector/crash_collector.cc
+++ b/crash_collector/crash_collector.cc
@@ -28,7 +28,7 @@
 
 #include <android-base/file.h>
 #include <cutils/properties.h>
-#include <log/logger.h>
+#include <log/log.h>
 #include <private/android_filesystem_config.h>
 #include <utils/String8.h>
 
diff --git a/crash_collector/crash_dispatcher.cc b/crash_collector/crash_dispatcher.cc
index 596b383..ac8c2a0 100644
--- a/crash_collector/crash_dispatcher.cc
+++ b/crash_collector/crash_dispatcher.cc
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include <android-base/file.h>
-#include <log/logger.h>
+#include <log/log.h>
 
 namespace {
 
diff --git a/device.mk b/device.mk
index a343aed..917e755 100644
--- a/device.mk
+++ b/device.mk
@@ -35,7 +35,11 @@ else
 LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
 endif
 
+ifeq ($(TARGET_PRODUCT), ryu_kasan)
+LOCAL_FSTAB := $(LOCAL_PATH)/fstab.dragon.nocrypt
+else
 LOCAL_FSTAB := $(LOCAL_PATH)/fstab.dragon
+endif
 
 TARGET_RECOVERY_FSTAB = $(LOCAL_FSTAB)
 
@@ -55,6 +59,7 @@ PRODUCT_COPY_FILES := \
     $(LOCAL_PATH)/com.nvidia.nvsi.xml:system/etc/permissions/com.nvidia.nvsi.xml
 
 PRODUCT_PACKAGES += \
+    android.hardware.wifi@1.0-service \
     libwpa_client \
     hostapd \
     wificond \
@@ -82,6 +87,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.camera.full.xml:system/etc/permissions/android.hardware.camera.full.xml \
     frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
     frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
+    frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:system/etc/permissions/android.hardware.wifi.passpoint.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
     frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
     frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
@@ -118,6 +124,11 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth/BCM4350C0_003.001.012.0364.0754.hcd:$(TARGET_COPY_OUT_VENDOR)/firmware/bcm4350c0.hcd \
     $(LOCAL_PATH)/bluetooth/bt_vendor.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/bluetooth/bt_vendor.conf
 
+# Bluetooth HAL
+PRODUCT_PACKAGES += \
+    libbt-vendor \
+    android.hardware.bluetooth@1.0-impl
+
 # Copy dsp firmware to the vendor parition so it is available when hotwording
 # starts
 PRODUCT_COPY_FILES += \
@@ -145,8 +156,36 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     power.dragon \
+    sensors.dragon \
+    android.hardware.sensors@1.0-impl \
+    android.hardware.power@1.0-impl
+
+# Health HAL
+PRODUCT_PACKAGES += \
+    android.hardware.health@1.0-impl
+
+# Light HAL
+PRODUCT_PACKAGES += \
     lights.dragon \
-    sensors.dragon
+    android.hardware.light@2.0-impl
+
+# Keymaster HAL
+PRODUCT_PACKAGES += \
+    android.hardware.keymaster@3.0-impl
+
+# Gatekeeper HAL
+PRODUCT_PACKAGES += \
+    android.hardware.gatekeeper@1.0-impl
+
+# Dumpstate HAL
+PRODUCT_PACKAGES += \
+    android.hardware.dumpstate@1.0-service.dragon
+
+# Gralloc HAL
+PRODUCT_PACKAGES += \
+    android.hardware.graphics.mapper@2.0-impl \
+    android.hardware.graphics.allocator@2.0-impl \
+    android.hardware.graphics.allocator@2.0-service
 
 #TODO(dgreid) is this right?
 PRODUCT_PROPERTY_OVERRIDES := \
@@ -177,10 +216,9 @@ $(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-he
 
 # set default USB configuration
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    persist.sys.usb.config=mtp \
     ro.adb.secure=1 \
     ro.sf.lcd_density=320 \
-    ro.opengles.version=196609
+    ro.opengles.version=196610
 
 # for audio
 #TODO(dgreid) do we need libnvvisualizer?
@@ -191,14 +229,38 @@ PRODUCT_PACKAGES += \
     audio.usb.default \
     audio.r_submix.default
 
+PRODUCT_PACKAGES += \
+    android.hardware.audio@2.0-impl \
+    android.hardware.audio.effect@2.0-impl \
+    android.hardware.broadcastradio@1.0-impl \
+    android.hardware.soundtrigger@2.0-impl
+
+PRODUCT_PACKAGES += \
+    android.hardware.drm@1.0-impl
+
+PRODUCT_PACKAGES += \
+    android.hardware.graphics.composer@2.1-impl
+
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.audio.monitorRotation=true \
     ro.frp.pst=/dev/block/platform/700b0600.sdhci/by-name/PST
 
+# Default OMX service to non-Treble
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.media.treble_omx=false
+
+# ro.product.first_api_level indicates the first api level the device has commercially launched on.
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.product.first_api_level=23
+
 # for keyboard key mappings
 PRODUCT_PACKAGES += \
     DragonKeyboard
 
+# Vibrator HAL
+PRODUCT_PACKAGES += \
+    android.hardware.vibrator@1.0-impl
+
 # Allows healthd to boot directly from charger mode rather than initiating a reboot.
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     ro.enable_boot_charger_mode=1
@@ -240,4 +302,8 @@ PRODUCT_PACKAGES += \
     rmi4update \
     rmihidtool
 
+# Vendor seccomp policy files for media components:
+PRODUCT_COPY_FILES += \
+    device/google/dragon/seccomp_policy/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy
+
 $(call inherit-product-if-exists, vendor/nvidia/dragon/dragon-vendor.mk)
diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk
index d5c807f..1d0e48a 100644
--- a/dumpstate/Android.mk
+++ b/dumpstate/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2013 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,15 +12,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_C_INCLUDES := frameworks/native/cmds/dumpstate
+LOCAL_PATH := $(call my-dir)
 
-LOCAL_SRC_FILES := dumpstate.cpp
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.dumpstate@1.0-service.dragon
+LOCAL_INIT_RC := android.hardware.dumpstate@1.0-service.dragon.rc
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_SRC_FILES := \
+    DumpstateDevice.cpp \
+    service.cpp
 
-LOCAL_MODULE := libdumpstate.dragon
+LOCAL_SHARED_LIBRARIES := \
+    android.hardware.dumpstate@1.0 \
+    libbase \
+    libcutils \
+    libdumpstateutil \
+    libhidlbase \
+    libhidltransport \
+    libhwbinder \
+    liblog \
+    libutils
 
 LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_EXECUTABLE)
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
new file mode 100644
index 0000000..c99a5ee
--- /dev/null
+++ b/dumpstate/DumpstateDevice.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "dumpstate"
+
+#include "DumpstateDevice.h"
+
+#include <log/log.h>
+#include <cutils/properties.h>
+
+#include "DumpstateUtil.h"
+
+using android::os::dumpstate::CommandOptions;
+using android::os::dumpstate::DumpFileToFd;
+using android::os::dumpstate::RunCommandToFd;
+
+namespace android {
+namespace hardware {
+namespace dumpstate {
+namespace V1_0 {
+namespace implementation {
+
+// Methods from ::android::hardware::dumpstate::V1_0::IDumpstateDevice follow.
+Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
+    if (handle == nullptr || handle->numFds < 1) {
+        ALOGE("no FDs\n");
+        return Void();
+    }
+
+    int fd = handle->data[0];
+    if (fd < 0) {
+        ALOGE("invalid FD: %d\n", handle->data[0]);
+        return Void();
+    }
+
+    /* ask init.dragon.rc to dump the charging state and wait */
+    property_set("debug.bq25892", "dump");
+    sleep(1);
+
+    DumpFileToFd(fd, "EC Version", "/sys/class/chromeos/cros_ec/version");
+    RunCommandToFd(fd, "FW Version", {"fwtool", "vboot"}, CommandOptions::WithTimeout(5).Build());
+
+    DumpFileToFd(fd, "INTERRUPTS", "/proc/interrupts");
+    // This is the file created by setting debug.bq25892.
+    DumpFileToFd(fd, "Charger chip registers", "/data/misc/fw_logs/bq25892.txt");
+
+    DumpFileToFd(fd, "Battery gas gauge", "/sys/class/power_supply/bq27742-0/uevent");
+    DumpFileToFd(fd, "Touchscreen firmware updater", "/data/misc/touchfwup/rmi4update.txt");
+    DumpFileToFd(fd, "Ion heap", "/d/ion/heaps/system");
+
+    return Void();
+}
+
+}  // namespace implementation
+}  // namespace V1_0
+}  // namespace dumpstate
+}  // namespace hardware
+}  // namespace android
diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h
new file mode 100644
index 0000000..f8585f5
--- /dev/null
+++ b/dumpstate/DumpstateDevice.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ANDROID_HARDWARE_DUMPSTATE_V1_0_DUMPSTATEDEVICE_H
+#define ANDROID_HARDWARE_DUMPSTATE_V1_0_DUMPSTATEDEVICE_H
+
+#include <android/hardware/dumpstate/1.0/IDumpstateDevice.h>
+#include <hidl/MQDescriptor.h>
+#include <hidl/Status.h>
+
+namespace android {
+namespace hardware {
+namespace dumpstate {
+namespace V1_0 {
+namespace implementation {
+
+using ::android::hardware::dumpstate::V1_0::IDumpstateDevice;
+using ::android::hardware::hidl_array;
+using ::android::hardware::hidl_handle;
+using ::android::hardware::hidl_string;
+using ::android::hardware::hidl_vec;
+using ::android::hardware::Return;
+using ::android::hardware::Void;
+using ::android::sp;
+
+struct DumpstateDevice : public IDumpstateDevice {
+    // Methods from ::android::hardware::dumpstate::V1_0::IDumpstateDevice follow.
+    Return<void> dumpstateBoard(const hidl_handle& h) override;
+
+};
+
+}  // namespace implementation
+}  // namespace V1_0
+}  // namespace dumpstate
+}  // namespace hardware
+}  // namespace android
+
+#endif  // ANDROID_HARDWARE_DUMPSTATE_V1_0_DUMPSTATEDEVICE_H
diff --git a/dumpstate/NOTICE b/dumpstate/NOTICE
index 598044e..1a5b8e4 100644
--- a/dumpstate/NOTICE
+++ b/dumpstate/NOTICE
@@ -1,5 +1,5 @@
 
-   Copyright (C) 2013 The Android Open Source Project
+   Copyright (C) 2015 The Android Open Source Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/dumpstate/android.hardware.dumpstate@1.0-service.dragon.rc b/dumpstate/android.hardware.dumpstate@1.0-service.dragon.rc
new file mode 100644
index 0000000..30954e3
--- /dev/null
+++ b/dumpstate/android.hardware.dumpstate@1.0-service.dragon.rc
@@ -0,0 +1,4 @@
+service dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service.dragon
+    class hal
+    user system
+    group system
diff --git a/dumpstate/dumpstate.cpp b/dumpstate/dumpstate.cpp
deleted file mode 100644
index 1c12221..0000000
--- a/dumpstate/dumpstate.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <cutils/properties.h>
-#include <dumpstate.h>
-
-void dumpstate_board()
-{
-    /* ask init.dragon.rc to dump the charging state and wait */
-    property_set("debug.bq25892", "dump");
-    sleep(1);
-
-    dump_file("EC Version", "/sys/class/chromeos/cros_ec/version");
-    run_command("FW Version", 5, "fwtool", "vboot", NULL);
-    dump_file("Charger chip registers", "/data/misc/fw_logs/bq25892.txt");
-    dump_file("Battery gas gauge", "/sys/class/power_supply/bq27742-0/uevent");
-    dump_file("Touchscreen firmware updater", "/data/misc/touchfwup/rmi4update.txt");
-    dump_file("Ion heap", "/d/ion/heaps/system");
-};
diff --git a/dumpstate/service.cpp b/dumpstate/service.cpp
new file mode 100644
index 0000000..4350233
--- /dev/null
+++ b/dumpstate/service.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_TAG "android.hardware.dumpstate@1.0-service.dragon"
+
+#include <hidl/HidlSupport.h>
+#include <hidl/HidlTransportSupport.h>
+
+#include "DumpstateDevice.h"
+
+using ::android::hardware::configureRpcThreadpool;
+using ::android::hardware::dumpstate::V1_0::IDumpstateDevice;
+using ::android::hardware::dumpstate::V1_0::implementation::DumpstateDevice;
+using ::android::hardware::joinRpcThreadpool;
+using ::android::OK;
+using ::android::sp;
+
+int main(int /* argc */, char* /* argv */ []) {
+    sp<IDumpstateDevice> dumpstate = new DumpstateDevice;
+    configureRpcThreadpool(1, true /* will join */);
+    if (dumpstate->registerAsService() != OK) {
+        ALOGE("Could not register service.");
+        return 1;
+    }
+    joinRpcThreadpool();
+
+    ALOGE("Service exited!");
+    return 1;
+}
diff --git a/fstab.dragon b/fstab.dragon
index 53ee543..3abebe9 100644
--- a/fstab.dragon
+++ b/fstab.dragon
@@ -6,7 +6,7 @@
 /dev/block/platform/700b0600.sdhci/by-name/APP		/system		ext4	ro,barrier=1							wait,verify
 /dev/block/platform/700b0600.sdhci/by-name/VNR		/vendor		ext4	ro,barrier=1							wait,verify
 /dev/block/platform/700b0600.sdhci/by-name/CAC		/cache		ext4	noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,errors=panic	wait,check
-/dev/block/platform/700b0600.sdhci/by-name/UDA		/data		ext4	noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,errors=panic	wait,check,forcefdeorfbe=/dev/block/platform/700b0600.sdhci/by-name/MD1
+/dev/block/platform/700b0600.sdhci/by-name/UDA		/data		ext4	noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,errors=panic	wait,check,forcefdeorfbe=/dev/block/platform/700b0600.sdhci/by-name/MD1,quota
 /dev/block/platform/700b0600.sdhci/by-name/KERN-A	/boot		emmc	defaults						defaults
 /dev/block/platform/700b0600.sdhci/by-name/recovery	/recovery	emmc	defaults						defaults
 /dev/block/platform/700b0600.sdhci/by-name/MSC		/misc		emmc	defaults						defaults
diff --git a/fstab.dragon.nocrypt b/fstab.dragon.nocrypt
new file mode 100644
index 0000000..cc18093
--- /dev/null
+++ b/fstab.dragon.nocrypt
@@ -0,0 +1,15 @@
+# Android fstab file.
+#<src>							<mnt_point>	<type>	<mnt_flags and options>					<fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+/dev/block/platform/700b0600.sdhci/by-name/APP		/system		ext4	ro,barrier=1							wait,verify
+/dev/block/platform/700b0600.sdhci/by-name/VNR		/vendor		ext4	ro,barrier=1							wait,verify
+/dev/block/platform/700b0600.sdhci/by-name/CAC		/cache		ext4	noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,errors=panic	wait,check
+/dev/block/platform/700b0600.sdhci/by-name/UDA		/data		ext4	noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,errors=panic	wait,check,quota
+/dev/block/platform/700b0600.sdhci/by-name/KERN-A	/boot		emmc	defaults						defaults
+/dev/block/platform/700b0600.sdhci/by-name/recovery	/recovery	emmc	defaults						defaults
+/dev/block/platform/700b0600.sdhci/by-name/MSC		/misc		emmc	defaults						defaults
+/dev/block/platform/700b0600.sdhci/by-name/PST		/persistent	emmc	defaults						defaults
+/dev/block/zram0					none		swap	defaults						zramsize=533413200,notrim
+/devices/70098000.usb/70090000.usb-host/usb*		auto		auto	defaults						voldmanaged=usb:auto
diff --git a/health/Android.mk b/health/Android.mk
index 6f34e07..106b932 100644
--- a/health/Android.mk
+++ b/health/Android.mk
@@ -21,6 +21,8 @@ LOCAL_MODULE := libhealthd.dragon
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_LIBRARIES := libhealthd.default
+LOCAL_C_INCLUDES := system/core/healthd/include system/core/base/include
+
+LOCAL_STATIC_LIBRARIES := libcutils
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/init.dragon.rc b/init.dragon.rc
index 93292d7..77309cc 100644
--- a/init.dragon.rc
+++ b/init.dragon.rc
@@ -84,7 +84,7 @@ on post-fs-data
     mkdir /data/misc/fw_logs 0755 root root
 
     # touch firmware updater logs
-    mkdir /data/misc/touchfwup 0750 root log
+    mkdir /data/misc/touchfwup 0755 root log
 
     # initialize region info
     exec -- /system/bin/init_regions.sh
@@ -135,7 +135,6 @@ on boot
     # update foreground cpuset now that processors are up
     # reserve CPU 3 for the top app
     write /dev/cpuset/foreground/cpus 0-2
-    write /dev/cpuset/foreground/boost/cpus 0-2
     write /dev/cpuset/background/cpus 0
     write /dev/cpuset/system-background/cpus 0-1
     write /dev/cpuset/top-app/cpus 0-3
@@ -184,6 +183,9 @@ on boot
     # leaks much harder to notice and debug.
     setrlimit 7 2048 4096
 
+    # Wifi firmware reload path
+    chown wifi wifi /sys/module/bcmdhd/parameters/firmware_path
+
 on fs
     # Enable verity notification
     write /sys/module/dm_verity/parameters/error_behavior notify
@@ -217,7 +219,7 @@ service bugreport /system/bin/dumpstate -d -p -B -z \
     oneshot
     keycodes 114 115 116
 
-service wpa_supplicant /system/bin/wpa_supplicant \
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
     -I/system/etc/wifi/p2p_supplicant_overlay.conf \
     -puse_p2p_group_interface=1p2p_device=1 \
diff --git a/manifest.xml b/manifest.xml
new file mode 100644
index 0000000..f91ac78
--- /dev/null
+++ b/manifest.xml
@@ -0,0 +1,30 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.graphics.allocator</name>
+        <transport>hwbinder</transport>
+        <impl level="generic"></impl>
+        <version>2.0</version>
+        <interface>
+            <name>IAllocator</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.wifi</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IWifi</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.wifi.supplicant</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ISupplicant</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 506f6ad..1b13f00 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -58,9 +58,6 @@
     <!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
     <bool translatable="false" name="config_wifi_dual_band_support">true</bool>
 
-    <!-- Boolean indicating whether Hotspot 2.0/Passpoint and ANQP queries is enabled -->
-    <bool translatable="false" name="config_wifi_hotspot2_enabled">true</bool>
-
     <!-- Boolean indicating whether the wifi chipset has background scan support -->
     <bool translatable="false" name="config_wifi_background_scan_support">true</bool>
 
diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml
deleted file mode 100644
index 11092b2..0000000
--- a/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Height of the bottom navigation / system bar. -->
-    <dimen name="navigation_bar_height">56dp</dimen>
-
-    <!-- Height of the bottom navigation bar in landscape; often
-         the same as @dimen/navigation_bar_height -->
-    <dimen name="navigation_bar_height_landscape">56dp</dimen>
-
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-hdpi/ic_launcher_downloads.png b/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-hdpi/ic_launcher_downloads.png
deleted file mode 100644
index cd3a037..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-hdpi/ic_launcher_downloads.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-mdpi/ic_launcher_downloads.png b/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-mdpi/ic_launcher_downloads.png
deleted file mode 100644
index 8d08e9b..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-mdpi/ic_launcher_downloads.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-xhdpi/ic_launcher_downloads.png b/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-xhdpi/ic_launcher_downloads.png
deleted file mode 100644
index f3bacb7..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-xhdpi/ic_launcher_downloads.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-xxhdpi/ic_launcher_downloads.png b/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-xxhdpi/ic_launcher_downloads.png
deleted file mode 100644
index 5156171..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-xxhdpi/ic_launcher_downloads.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-xxxhdpi/ic_launcher_downloads.png b/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-xxxhdpi/ic_launcher_downloads.png
deleted file mode 100644
index 6dc2f76..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/mipmap-xxxhdpi/ic_launcher_downloads.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-af/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-af/strings.xml
deleted file mode 100644
index 9f9da10..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-af/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Lêers"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-am/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-am/strings.xml
deleted file mode 100644
index ece2325..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-am/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ፋይሎች"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ar/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ar/strings.xml
deleted file mode 100644
index 44f245c..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ar/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"الملفات"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-az-rAZ/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-az-rAZ/strings.xml
deleted file mode 100644
index 84d7ffa..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-az-rAZ/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Fayllar"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-bg/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-bg/strings.xml
deleted file mode 100644
index dddd0da..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-bg/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Файлове"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-bn-rBD/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-bn-rBD/strings.xml
deleted file mode 100644
index 5c58fb2..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-bn-rBD/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ফাইলগুলি"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ca/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ca/strings.xml
deleted file mode 100644
index d3e2b32..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ca/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Fitxers"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-cs/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-cs/strings.xml
deleted file mode 100644
index e2c9bd3..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-cs/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Soubory"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-da/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-da/strings.xml
deleted file mode 100644
index 3870b7e..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-da/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Filer"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-de/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-de/strings.xml
deleted file mode 100644
index 2140efa..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-de/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Dateien"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-el/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-el/strings.xml
deleted file mode 100644
index 14b747e..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-el/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Αρχεία"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-en-rAU/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-en-rAU/strings.xml
deleted file mode 100644
index 4fd80e7..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Files"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-en-rGB/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-en-rGB/strings.xml
deleted file mode 100644
index 4fd80e7..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Files"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-en-rIN/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-en-rIN/strings.xml
deleted file mode 100644
index 4fd80e7..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Files"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-es-rUS/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-es-rUS/strings.xml
deleted file mode 100644
index e600e7c..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Archivos"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-es/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-es/strings.xml
deleted file mode 100644
index e600e7c..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-es/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Archivos"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-et-rEE/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-et-rEE/strings.xml
deleted file mode 100644
index 7ac0e35..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-et-rEE/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Failid"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-eu-rES/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-eu-rES/strings.xml
deleted file mode 100644
index 331afb2..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-eu-rES/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Fitxategiak"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-fa/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-fa/strings.xml
deleted file mode 100644
index 84b8731..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-fa/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"فایل‌ها"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-fi/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-fi/strings.xml
deleted file mode 100644
index 8bdf655..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-fi/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Tiedostot"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-fr-rCA/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-fr-rCA/strings.xml
deleted file mode 100644
index d5be30c..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Fichiers"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-fr/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-fr/strings.xml
deleted file mode 100644
index d5be30c..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-fr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Fichiers"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-gl-rES/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-gl-rES/strings.xml
deleted file mode 100644
index 6d3cbdb..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-gl-rES/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Ficheiros"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-gu-rIN/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-gu-rIN/strings.xml
deleted file mode 100644
index ac648ee..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-gu-rIN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ફાઇલો"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-hi/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-hi/strings.xml
deleted file mode 100644
index 342bfef..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-hi/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"फ़ाइलें"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-hr/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-hr/strings.xml
deleted file mode 100644
index aa83376..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-hr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Datoteke"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-hu/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-hu/strings.xml
deleted file mode 100644
index 047fd73..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-hu/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Fájlok"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-hy-rAM/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-hy-rAM/strings.xml
deleted file mode 100644
index d27e6f3..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-hy-rAM/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Ֆայլեր"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-in/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-in/strings.xml
deleted file mode 100644
index 392ef2d..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-in/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"File"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-is-rIS/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-is-rIS/strings.xml
deleted file mode 100644
index e70ea63..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-is-rIS/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Skrár"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-it/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-it/strings.xml
deleted file mode 100644
index 392ef2d..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-it/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"File"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-iw/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-iw/strings.xml
deleted file mode 100644
index cd51f4b..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-iw/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"קבצים"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ja/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ja/strings.xml
deleted file mode 100644
index b135cfb..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ja/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ファイル"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ka-rGE/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ka-rGE/strings.xml
deleted file mode 100644
index f6f96e1..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ka-rGE/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ფაილები"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-kk-rKZ/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
deleted file mode 100644
index 37a289c..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Файлдар"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-km-rKH/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-km-rKH/strings.xml
deleted file mode 100644
index 14deb53..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-km-rKH/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ឯកសារ"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-kn-rIN/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-kn-rIN/strings.xml
deleted file mode 100644
index 93475bd..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ಫೈಲ್‌ಗಳು"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ko/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ko/strings.xml
deleted file mode 100644
index b69a893..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ko/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"파일"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ky-rKG/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ky-rKG/strings.xml
deleted file mode 100644
index 37a289c..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ky-rKG/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Файлдар"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-lo-rLA/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-lo-rLA/strings.xml
deleted file mode 100644
index c711611..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-lo-rLA/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"​ໄຟລ໌"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-lt/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-lt/strings.xml
deleted file mode 100644
index c06b02d..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-lt/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Failai"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-lv/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-lv/strings.xml
deleted file mode 100644
index 8f4b917..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-lv/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Faili"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-mk-rMK/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-mk-rMK/strings.xml
deleted file mode 100644
index 7446531..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-mk-rMK/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Датотеки"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ml-rIN/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ml-rIN/strings.xml
deleted file mode 100644
index 13d3629..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ml-rIN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ഫയലുകൾ"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-mn-rMN/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-mn-rMN/strings.xml
deleted file mode 100644
index c07453c..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-mn-rMN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Файл"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-mr-rIN/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-mr-rIN/strings.xml
deleted file mode 100644
index 171ed17..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-mr-rIN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"फायली"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ms-rMY/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ms-rMY/strings.xml
deleted file mode 100644
index 84b1fdb..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ms-rMY/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Fail"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-my-rMM/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-my-rMM/strings.xml
deleted file mode 100644
index c40ab7e..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-my-rMM/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ဖိုင်များ"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-nb/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-nb/strings.xml
deleted file mode 100644
index 3870b7e..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-nb/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Filer"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ne-rNP/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ne-rNP/strings.xml
deleted file mode 100644
index 170af30..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ne-rNP/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"फाइलहरू"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-nl/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-nl/strings.xml
deleted file mode 100644
index 144888a..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-nl/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Bestanden"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-pa-rIN/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-pa-rIN/strings.xml
deleted file mode 100644
index 953eae6..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-pa-rIN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ਫ਼ਾਈਲਾਂ"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-pl/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-pl/strings.xml
deleted file mode 100644
index 4c3f6e5..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-pl/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Pliki"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-pt-rBR/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-pt-rBR/strings.xml
deleted file mode 100644
index d5aa3e8..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Arquivos"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-pt-rPT/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 6d3cbdb..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Ficheiros"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-pt/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-pt/strings.xml
deleted file mode 100644
index d5aa3e8..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-pt/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Arquivos"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ro/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ro/strings.xml
deleted file mode 100644
index 77bd600..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ro/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Fișiere"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ru/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ru/strings.xml
deleted file mode 100644
index a8be899..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ru/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Файлы"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-si-rLK/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-si-rLK/strings.xml
deleted file mode 100644
index 85df47f..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-si-rLK/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ගොනු"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-sk/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-sk/strings.xml
deleted file mode 100644
index e42b0a7..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-sk/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Súbory"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-sl/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-sl/strings.xml
deleted file mode 100644
index aa83376..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-sl/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Datoteke"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-sq-rAL/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-sq-rAL/strings.xml
deleted file mode 100644
index dd966d3..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-sq-rAL/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Skedarët"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-sr/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-sr/strings.xml
deleted file mode 100644
index 77997c5..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-sr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Датотеке"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-sv/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-sv/strings.xml
deleted file mode 100644
index 3870b7e..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-sv/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Filer"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-sw/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-sw/strings.xml
deleted file mode 100644
index 8f4b917..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-sw/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Faili"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ta-rIN/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ta-rIN/strings.xml
deleted file mode 100644
index 179603f..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ta-rIN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"கோப்புகள்"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-te-rIN/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-te-rIN/strings.xml
deleted file mode 100644
index c331ee0..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-te-rIN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ఫైల్‌లు"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-th/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-th/strings.xml
deleted file mode 100644
index 66637a2..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-th/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"ไฟล์"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-tl/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-tl/strings.xml
deleted file mode 100644
index c0770a0..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-tl/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Mga File"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-tr/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-tr/strings.xml
deleted file mode 100644
index 1dc5dc6..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-tr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Dosyalar"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-uk/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-uk/strings.xml
deleted file mode 100644
index c23b93b..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-uk/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Файли"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-ur-rPK/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-ur-rPK/strings.xml
deleted file mode 100644
index 364c5da..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-ur-rPK/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"فائلیں"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-uz-rUZ/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
deleted file mode 100644
index 84d7ffa..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Fayllar"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-vi/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-vi/strings.xml
deleted file mode 100644
index 7e31a12..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-vi/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Tệp"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-zh-rCN/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-zh-rCN/strings.xml
deleted file mode 100644
index e40d006..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"文件"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-zh-rHK/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-zh-rHK/strings.xml
deleted file mode 100644
index 98b66ae..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"檔案"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-zh-rTW/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 98b66ae..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"檔案"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values-zu/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values-zu/strings.xml
deleted file mode 100644
index 6ff7d72..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values-zu/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="downloads_label" msgid="8239453819144668344">"Amafayela"</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values/config.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values/config.xml
deleted file mode 100644
index cfed70c..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values/config.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="productivity_device">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/packages/DocumentsUI/res/values/strings.xml b/overlay/frameworks/base/packages/DocumentsUI/res/values/strings.xml
deleted file mode 100644
index 445502e..0000000
--- a/overlay/frameworks/base/packages/DocumentsUI/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="downloads_label">Files</string>
-</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png b/overlay/frameworks/base/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png
deleted file mode 100644
index b790d71..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-sw600dp/ic_ime_switcher_default.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-sw600dp/ic_ime_switcher_default.xml
deleted file mode 100644
index bcf9cac..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-sw600dp/ic_ime_switcher_default.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28.0dp"
-    android:height="28.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:pathData="M20.000000,5.000000L4.000000,5.000000C2.900000,5.000000 2.000000,5.900000 2.000000,7.000000l0.000000,10.000000c0.000000,1.100000 0.900000,2.000000 2.000000,2.000000l16.000000,0.000000c1.100000,0.000000 2.000000,-0.900000 2.000000,-2.000000L22.000000,7.000000C22.000000,5.900000 21.100000,5.000000 20.000000,5.000000zM11.000000,8.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000L11.000000,8.000000zM11.000000,11.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000L11.000000,11.000000zM8.000000,8.000000l2.000000,0.000000l0.000000,2.000000L8.000000,10.000000L8.000000,8.000000zM8.000000,11.000000l2.000000,0.000000l0.000000,2.000000L8.000000,13.000000L8.000000,11.000000zM7.000000,13.000000L5.000000,13.000000l0.000000,-2.000000l2.000000,0.000000L7.000000,13.000000zM7.000000,10.000000L5.000000,10.000000L5.000000,8.000000l2.000000,0.000000L7.000000,10.000000zM16.000000,17.000000L8.000000,17.000000l0.000000,-2.000000l8.000000,0.000000L16.000000,17.000000zM16.000000,13.000000l-2.000000,0.000000l0.000000,-2.000000l2.000000,0.000000L16.000000,13.000000zM16.000000,10.000000l-2.000000,0.000000L14.000000,8.000000l2.000000,0.000000L16.000000,10.000000zM19.000000,13.000000l-2.000000,0.000000l0.000000,-2.000000l2.000000,0.000000L19.000000,13.000000zM19.000000,10.000000l-2.000000,0.000000L17.000000,8.000000l2.000000,0.000000L19.000000,10.000000z"
-        android:fillColor="@color/navigation_bar_icon_color"/>
-</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png b/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png
deleted file mode 100644
index fbdc93c..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png b/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png
deleted file mode 100644
index 419518c..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png b/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png
deleted file mode 100644
index a2406b1..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png b/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png
deleted file mode 100644
index 50043eb..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png b/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png
deleted file mode 100644
index c449449..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png
+++ /dev/null
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp-land/dimens.xml
deleted file mode 100644
index 1c1f8b6..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp-land/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
--->
-<resources>
-
-    <dimen name="navigation_side_padding">@dimen/button_size</dimen>
-    <dimen name="navigation_key_width">@dimen/button_size</dimen>
-    <dimen name="navigation_extra_key_width">@dimen/button_size</dimen>
-
-</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/config.xml
deleted file mode 100644
index 182fa36..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Nav bar button default ordering/layout -->
-    <string name="config_navBarLayout" translatable="false">space[.2],back,home;space;menu_ime,recent,space[.2]</string>
-
-</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 8c066fa..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2016, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
--->
-<resources>
-
-    <!-- All ryu nav buttons are th same size -->
-    <dimen name="button_size">80dp</dimen>
-    <dimen name="navigation_side_padding">@dimen/button_size</dimen>
-    <dimen name="navigation_key_width">@dimen/button_size</dimen>
-    <dimen name="navigation_key_width_sw600dp_land">@dimen/button_size</dimen>
-    <dimen name="navigation_extra_key_width">@dimen/button_size</dimen>
-
-    <!-- The maximum width of the navigation bar ripples. -->
-    <dimen name="key_button_ripple_max_width">76dp</dimen>
-
-    <!-- The padding around the navigation buttons -->
-    <dimen name="navigation_key_padding">5dp</dimen>
-    <dimen name="navigation_key_padding_sw600dp_land">5dp</dimen>
-
-</resources>
diff --git a/power/power_dragon.cpp b/power/power_dragon.cpp
index ca496d2..45cc06f 100644
--- a/power/power_dragon.cpp
+++ b/power/power_dragon.cpp
@@ -232,7 +232,37 @@ static void dragon_power_hint(struct power_module *module, power_hint_t hint,
 static int dragon_power_open(const hw_module_t *module, const char *name,
                             hw_device_t **device)
 {
-    return 0;
+    ALOGD("%s: enter; name=%s", __FUNCTION__, name);
+    int retval = 0; /* 0 is ok; -1 is error */
+
+    if (strcmp(name, POWER_HARDWARE_MODULE_ID) == 0) {
+        dragon_power_module *dev = (dragon_power_module *)calloc(1,
+                sizeof(dragon_power_module));
+
+        if (dev) {
+            /* Common hw_device_t fields */
+            dev->base.common.tag = HARDWARE_MODULE_TAG;
+            dev->base.common.module_api_version = POWER_MODULE_API_VERSION_0_2;
+            dev->base.common.hal_api_version = HARDWARE_HAL_API_VERSION;
+
+            dev->base.init = power_init;
+            dev->base.powerHint = dragon_power_hint;
+            dev->base.setInteractive = power_set_interactive;
+            dev->boost_pulse_lock = PTHREAD_MUTEX_INITIALIZER;
+            dev->low_power_lock = PTHREAD_MUTEX_INITIALIZER;
+            dev->boostpulse_fd = -1;
+            dev->boostpulse_warned = 0;
+            dev->gpu_qos_manager = NULL;
+
+            *device = (hw_device_t*)dev;
+        } else
+            retval = -ENOMEM;
+    } else {
+        retval = -EINVAL;
+    }
+
+    ALOGD("%s: exit %d", __FUNCTION__, retval);
+    return retval;
 }
 
 
diff --git a/recovery/OWNERS b/recovery/OWNERS
new file mode 100644
index 0000000..9f6ef9e
--- /dev/null
+++ b/recovery/OWNERS
@@ -0,0 +1,3 @@
+set noparent
+tbao@google.com
+xunchang@google.com
diff --git a/recovery/updater/Android.mk b/recovery/updater/Android.mk
index 4481a5f..207aa91 100644
--- a/recovery/updater/Android.mk
+++ b/recovery/updater/Android.mk
@@ -13,10 +13,12 @@ LOCAL_SRC_FILES := \
     vboot_interface.c \
     recovery_updater.cpp \
     update_fw.cpp
-LOCAL_C_INCLUDES += bootable/recovery
 # For vboot_struct.h
 LOCAL_C_INCLUDES += external/vboot_reference/firmware/include
 LOCAL_CFLAGS += -Werror
+LOCAL_STATIC_LIBRARIES := \
+    libedify \
+    libotautil
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -30,23 +32,26 @@ LOCAL_SRC_FILES := \
     flash_file.cpp \
     vboot_interface.c \
     recovery_ui.cpp
+# For ui.h, common.h (included by recovery_ui.cpp).
 LOCAL_C_INCLUDES += bootable/recovery
 # For vboot_struct.h
 LOCAL_C_INCLUDES += external/vboot_reference/firmware/include
 LOCAL_CFLAGS += -Werror
+LOCAL_STATIC_LIBRARIES := \
+    libedify
 
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := fwtool
 LOCAL_MODULE_TAGS := optional
-LOCAL_CLANG := true
 LOCAL_SRC_FILES := flash_ec.c flash_mtd.c flash_device.c vboot_interface.c debug_ec.c flash_file.cpp fwtool.cpp update_fw.cpp
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_CFLAGS += -Wno-unused-parameter -DUSE_LOGCAT
-LOCAL_C_INCLUDES += bootable/recovery
 # For vboot_struct.h
 LOCAL_C_INCLUDES += external/vboot_reference/firmware/include
+LOCAL_STATIC_LIBRARIES := \
+    libedify
 
 include $(BUILD_EXECUTABLE)
 
diff --git a/recovery/updater/flash_file.cpp b/recovery/updater/flash_file.cpp
index 340150f..48e6bb6 100644
--- a/recovery/updater/flash_file.cpp
+++ b/recovery/updater/flash_file.cpp
@@ -58,7 +58,7 @@ static void *file_open(const void *params)
 		return file_blob_open(dev, value);
 
 	if (value->type != VAL_STRING)
-		return NULL;
+		goto out_free;
 
 	dev->fd = open(value->data.c_str(), O_RDWR);
 	if (dev->fd == -1) {
diff --git a/recovery/updater/recovery_updater.cpp b/recovery/updater/recovery_updater.cpp
index 9519310..a478584 100644
--- a/recovery/updater/recovery_updater.cpp
+++ b/recovery/updater/recovery_updater.cpp
@@ -24,17 +24,20 @@
 #include <string>
 #include <vector>
 
-#include "edify/expr.h"
+#include <edify/expr.h>
+#include <otautil/error_code.h>
+
 #include "update_fw.h"
 
-Value* firmware_update(const char *name, State * state, int argc, Expr * argv[]) {
+Value* firmware_update(const char *name, State * state,
+                       const std::vector<std::unique_ptr<Expr>>& argv) {
 	printf("%s: running %s.\n", __func__, name);
-	if (argc < 2) {
+	if (argv.size() != 2) {
 		ErrorAbort(state, kArgsParsingFailure, "syntax: %s bios.bin ec.bin", name);
 		return nullptr;
 	}
 	std::vector<std::unique_ptr<Value>> args;
-	if (!ReadValueArgs(state, 2, argv, &args)) {
+	if (!ReadValueArgs(state, argv, &args)) {
 		ErrorAbort(state, kArgsParsingFailure, "%s: invalid arguments", name);
 		return nullptr;
 	}
diff --git a/recovery/updater/vboot_interface.c b/recovery/updater/vboot_interface.c
index a37a1c7..9e74b2b 100644
--- a/recovery/updater/vboot_interface.c
+++ b/recovery/updater/vboot_interface.c
@@ -52,18 +52,26 @@ char *fdt_read_string(const char *prop)
 	fseek(file, 0, SEEK_END);
 	size = ftell(file);
 	data = malloc(size + 1);
-	if (!data)
-		return NULL;
+	if (!data) {
+		goto out_close;
+	}
 	data[size] = '\0';
 
 	rewind(file);
 	if (fread(data, 1, size, file) != size) {
 		ALOGD("Unable to read FDT property %s\n", prop);
-		return NULL;
+		goto out_free;
 	}
 	fclose(file);
 
 	return data;
+
+out_free:
+	free(data);
+
+out_close:
+	fclose(file);
+	return NULL;
 }
 
 uint32_t fdt_read_u32(const char *prop)
@@ -80,6 +88,7 @@ uint32_t fdt_read_u32(const char *prop)
 	}
 	if (fread(&data, 1, sizeof(data), file) != sizeof(data)) {
 		ALOGD("Unable to read FDT property %s\n", prop);
+		fclose(file);
 		return -1U;
 	}
 	fclose(file);
diff --git a/seccomp/mediacodec-seccomp.policy b/seccomp_policy/mediacodec.policy
index e5e0128..e5e0128 100644
--- a/seccomp/mediacodec-seccomp.policy
+++ b/seccomp_policy/mediacodec.policy
diff --git a/self-extractors/google_devices/staging/BoardConfigPartial.mk b/self-extractors/google_devices/staging/BoardConfigPartial.mk
index 2987710..7bc5e67 100644
--- a/self-extractors/google_devices/staging/BoardConfigPartial.mk
+++ b/self-extractors/google_devices/staging/BoardConfigPartial.mk
@@ -11,3 +11,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/dragon/proprietary/vendor.img
diff --git a/self-extractors/google_devices/staging/device-partial.mk b/self-extractors/google_devices/staging/device-partial.mk
index 9231b35..2987710 100644
--- a/self-extractors/google_devices/staging/device-partial.mk
+++ b/self-extractors/google_devices/staging/device-partial.mk
@@ -11,8 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-# Vendor blob(s) necessary for Dragon hardware
-PRODUCT_COPY_FILES := \
-    vendor/google_devices/dragon/proprietary/vendor.img:vendor.img:google \
-
diff --git a/sensor_hub/cros_ec_sensors.h b/sensor_hub/cros_ec_sensors.h
index d28311d..61b3124 100644
--- a/sensor_hub/cros_ec_sensors.h
+++ b/sensor_hub/cros_ec_sensors.h
@@ -30,7 +30,11 @@
 #define IIO_MAX_BUFF_SIZE 4096
 #define INT32_CHAR_LEN 12
 
-#define IIO_MAX_DEVICE_NAME_LENGTH (strlen(IIO_DIR) + IIO_MAX_NAME_LENGTH)
+/*
+ * Use sizeof(...) - 1 instead of strlen because clang FORTIFY makes strlen
+ * non-constant.
+ */
+#define IIO_MAX_DEVICE_NAME_LENGTH (sizeof(IIO_DIR) - 1 + IIO_MAX_NAME_LENGTH)
 
 #define CROS_EC_MAX_SAMPLING_PERIOD ((1 << 16) - 2)
 
diff --git a/sensor_hub/sensors.cpp b/sensor_hub/sensors.cpp
index 8145845..31834a4 100644
--- a/sensor_hub/sensors.cpp
+++ b/sensor_hub/sensors.cpp
@@ -86,126 +86,126 @@ const int cros_ec_gesture_id[] = {
  */
 static const struct sensor_t sSensorListTemplate[] = {
     [CROS_EC_ACCEL] = {
-        name:               "CrosEC Accelerometer",
-        vendor:             "Google",
-        version:            1,
-        handle:             UNSET_FIELD,
-        type:               SENSOR_TYPE_ACCELEROMETER,
-        maxRange:           UNSET_FIELD,
-        resolution:         UNSET_FIELD,
-        power:              0.18f,    /* Based on BMI160 */
-        minDelay:           5000,
-        fifoReservedEventCount: 0,
-        fifoMaxEventCount:  CROS_EC_FIFO_SIZE,
-        stringType:         SENSOR_STRING_TYPE_ACCELEROMETER,
-        requiredPermission: 0,
+        .name =              "CrosEC Accelerometer",
+        .vendor =            "Google",
+        .version =           1,
+        .handle =            UNSET_FIELD,
+        .type =              SENSOR_TYPE_ACCELEROMETER,
+        .maxRange =          UNSET_FIELD,
+        .resolution =        UNSET_FIELD,
+        .power =             0.18f,    /* Based on BMI160 */
+        .minDelay =          5000,
+        .fifoReservedEventCount =0,
+        .fifoMaxEventCount = CROS_EC_FIFO_SIZE,
+        .stringType =        SENSOR_STRING_TYPE_ACCELEROMETER,
+        .requiredPermission =0,
         /*
          * BMI160 has a problem at 6.25Hz or less, FIFO not readable.
          * Works at 12.5Hz, so set maxDelay at 80ms
          */
-        maxDelay:           80000,
-        flags:              SENSOR_FLAG_CONTINUOUS_MODE,
-        reserved:           { 0 }
+        .maxDelay =          80000,
+        .flags =             SENSOR_FLAG_CONTINUOUS_MODE,
+        .reserved =          { 0 }
     },
     [CROS_EC_GYRO] = {
-        name:               "CrosEC Gyroscope",
-        vendor:             "Google",
-        version:            1,
-        handle:             UNSET_FIELD,
-        type:               SENSOR_TYPE_GYROSCOPE,
-        maxRange:           UNSET_FIELD,
-        resolution:         UNSET_FIELD,
-        power:              0.85f,
-        minDelay:           5000,
-        fifoReservedEventCount: 0,
-        fifoMaxEventCount:  CROS_EC_FIFO_SIZE,
-        stringType:         SENSOR_STRING_TYPE_GYROSCOPE,
-        requiredPermission: 0,
-        maxDelay:           80000,
-        flags:              SENSOR_FLAG_CONTINUOUS_MODE,
-        reserved:           { 0 }
+        .name =              "CrosEC Gyroscope",
+        .vendor =            "Google",
+        .version =           1,
+        .handle =            UNSET_FIELD,
+        .type =              SENSOR_TYPE_GYROSCOPE,
+        .maxRange =          UNSET_FIELD,
+        .resolution =        UNSET_FIELD,
+        .power =             0.85f,
+        .minDelay =          5000,
+        .fifoReservedEventCount =0,
+        .fifoMaxEventCount = CROS_EC_FIFO_SIZE,
+        .stringType =        SENSOR_STRING_TYPE_GYROSCOPE,
+        .requiredPermission =0,
+        .maxDelay =          80000,
+        .flags =             SENSOR_FLAG_CONTINUOUS_MODE,
+        .reserved =          { 0 }
     },
     [CROS_EC_MAG] = {
-        name:               "CrosEC Compass",
-        vendor:             "Google",
-        version:            1,
-        handle:             UNSET_FIELD,
-        type:               SENSOR_TYPE_MAGNETIC_FIELD,
-        maxRange:           UNSET_FIELD,
-        resolution:         UNSET_FIELD,
-        power:              5.0f,  /* Based on BMM150 */
+        .name =              "CrosEC Compass",
+        .vendor =            "Google",
+        .version =           1,
+        .handle =            UNSET_FIELD,
+        .type =              SENSOR_TYPE_MAGNETIC_FIELD,
+        .maxRange =          UNSET_FIELD,
+        .resolution =        UNSET_FIELD,
+        .power =             5.0f,  /* Based on BMM150 */
         /*
          * BMI150 uses repetition to reduce output noise.
          * Set ODR at no more than 25Hz.
          */
-        minDelay:           40000,
-        fifoReservedEventCount: 0,
-        fifoMaxEventCount:  CROS_EC_FIFO_SIZE,
-        stringType:         SENSOR_STRING_TYPE_MAGNETIC_FIELD,
-        requiredPermission: 0,
-        maxDelay:           200000,
-        flags:              SENSOR_FLAG_CONTINUOUS_MODE,
-        reserved:           { 0 }
+        .minDelay =          40000,
+        .fifoReservedEventCount =0,
+        .fifoMaxEventCount = CROS_EC_FIFO_SIZE,
+        .stringType =        SENSOR_STRING_TYPE_MAGNETIC_FIELD,
+        .requiredPermission =0,
+        .maxDelay =          200000,
+        .flags =             SENSOR_FLAG_CONTINUOUS_MODE,
+        .reserved =          { 0 }
     },
     [CROS_EC_PROX] = {
-        name:               "CrosEC Proximity",
-        vendor:             "Google",
-        version:            1,
-        handle:             UNSET_FIELD,
-        type:               SENSOR_TYPE_PROXIMITY,
-        maxRange:           UNSET_FIELD,
-        resolution:         UNSET_FIELD,
-        power:              0.12f,  /* Based on Si1141 */
-        minDelay:           20000,
-        fifoReservedEventCount: 0,
-        fifoMaxEventCount:  CROS_EC_FIFO_SIZE,
-        stringType:         SENSOR_STRING_TYPE_PROXIMITY,
-        requiredPermission: 0,
-        /* Forced mode, can be long: 10s */
-        maxDelay:           10000000,
+        .name =              "CrosEC Proximity",
+        .vendor =            "Google",
+        .version =           1,
+        .handle =            UNSET_FIELD,
+        .type =              SENSOR_TYPE_PROXIMITY,
+        .maxRange =          UNSET_FIELD,
+        .resolution =        UNSET_FIELD,
+        .power =             0.12f,  /* Based on Si1141 */
+        .minDelay =          20000,
+        .fifoReservedEventCount =0,
+        .fifoMaxEventCount = CROS_EC_FIFO_SIZE,
+        .stringType =        SENSOR_STRING_TYPE_PROXIMITY,
+        .requiredPermission =0,
+        /* Forced mode, can be long =10s */
+        .maxDelay =          10000000,
         /* WAKE UP required by API */
-        flags:              SENSOR_FLAG_ON_CHANGE_MODE | SENSOR_FLAG_WAKE_UP,
-        reserved:           { 0 }
+        .flags =             SENSOR_FLAG_ON_CHANGE_MODE | SENSOR_FLAG_WAKE_UP,
+        .reserved =          { 0 }
     },
     [CROS_EC_LIGHT] = {
-        name:               "CrosEC Light",
-        vendor:             "Google",
-        version:            1,
-        handle:             UNSET_FIELD,
-        type:               SENSOR_TYPE_LIGHT,
-        maxRange:           UNSET_FIELD,
-        resolution:         UNSET_FIELD,
-        power:              0.12f,  /* Based on Si1141 */
-        minDelay:           20000,
-        fifoReservedEventCount: 0,
-        fifoMaxEventCount:  CROS_EC_FIFO_SIZE,
-        stringType:         SENSOR_STRING_TYPE_LIGHT,
-        requiredPermission: 0,
-        /* Forced mode, can be long: 10s */
-        maxDelay:           10000000,
-        flags:              SENSOR_FLAG_ON_CHANGE_MODE,
-        reserved:           { 0 }
+        .name =              "CrosEC Light",
+        .vendor =            "Google",
+        .version =           1,
+        .handle =            UNSET_FIELD,
+        .type =              SENSOR_TYPE_LIGHT,
+        .maxRange =          UNSET_FIELD,
+        .resolution =        UNSET_FIELD,
+        .power =             0.12f,  /* Based on Si1141 */
+        .minDelay =          20000,
+        .fifoReservedEventCount =0,
+        .fifoMaxEventCount = CROS_EC_FIFO_SIZE,
+        .stringType =        SENSOR_STRING_TYPE_LIGHT,
+        .requiredPermission =0,
+        /* Forced mode, can be long =9s */
+        .maxDelay =          10000000,
+        .flags =             SENSOR_FLAG_ON_CHANGE_MODE,
+        .reserved =          { 0 }
     },
 };
 
 static const struct sensor_t sGestureListTemplate[] = {
     [CROS_EC_SIGMO] = {
-        name:               "CrosEC Significant Motion",
-        vendor:             "Google",
-        version:            1,
-        handle:             UNSET_FIELD,
-        type:               SENSOR_TYPE_SIGNIFICANT_MOTION,
-        maxRange:           1.0f,
-        resolution:         1.0f,
-        power:              0.18f,    /* Based on BMI160 */
-        minDelay:           -1,
-        fifoReservedEventCount: 0,
-        fifoMaxEventCount:  0,
-        stringType:         SENSOR_STRING_TYPE_SIGNIFICANT_MOTION,
-        requiredPermission: 0,
-        maxDelay:           0,
-        flags:              SENSOR_FLAG_ONE_SHOT_MODE | SENSOR_FLAG_WAKE_UP,
-        reserved:           { 0 }
+        .name =              "CrosEC Significant Motion",
+        .vendor =            "Google",
+        .version =           1,
+        .handle =            UNSET_FIELD,
+        .type =              SENSOR_TYPE_SIGNIFICANT_MOTION,
+        .maxRange =          1.0f,
+        .resolution =        1.0f,
+        .power =             0.18f,    /* Based on BMI160 */
+        .minDelay =          -1,
+        .fifoReservedEventCount =0,
+        .fifoMaxEventCount = 0,
+        .stringType =        SENSOR_STRING_TYPE_SIGNIFICANT_MOTION,
+        .requiredPermission =0,
+        .maxDelay =          0,
+        .flags =             SENSOR_FLAG_ONE_SHOT_MODE | SENSOR_FLAG_WAKE_UP,
+        .reserved =          { 0 }
     },
 };
 
@@ -283,7 +283,7 @@ static int cros_ec_get_sensors_list(struct sensors_module_t*,
 }
 
 /*
- * cros_ec_get_sensors_names: Build list of gestures from IIO
+ * cros_ec_get_gesture_names: Build list of gestures from IIO
  *
  * Looking into the cros_ec_activity sensors, looks for events
  * the sensorserivces are managing.
@@ -355,6 +355,8 @@ static int cros_ec_calibrate_3d_sensor(int sensor_type, const char *device_name)
     for (int i = X ; i < MAX_AXIS; i++) {
         snprintf(calib_key[i], sizeof(calib_key[i]), "%s_%c_calibbias",
                 cros_ec_iio_axis_names[sensor_type], 'x' + i);
+    }
+    for (int i = X ; i < MAX_AXIS; i++) {
         if (cros_ec_sysfs_get_attr(vpd_path, calib_key[i], calib_value[i])) {
             ALOGI("Calibration key %s missing.\n", calib_key[i]);
             calib_data_valid = false;
@@ -538,27 +540,27 @@ static int cros_ec_get_sensors_names(char **ring_device_name,
     if (*ring_device_name == NULL || *ring_trigger_name == NULL)
         return -ENODEV;
 
-    return Stotal_max_sensor_handle_ ? Stotal_max_sensor_handle_ : -ENODEV;
+    return Stotal_max_sensor_handle_ ? 0 : -ENODEV;
 }
 
 static struct hw_module_methods_t cros_ec_sensors_methods = {
-    open: cros_ec_open_sensors,
+    .open = cros_ec_open_sensors,
 };
 
 struct sensors_module_t HAL_MODULE_INFO_SYM = {
-    common: {
-      tag: HARDWARE_MODULE_TAG,
-      version_major: 1,
-      version_minor: 0,
-      id: SENSORS_HARDWARE_MODULE_ID,
-      name: "CrosEC sensor hub module",
-      author: "Google",
-      methods: &cros_ec_sensors_methods,
-      dso: NULL,
-      reserved: { 0 },
+    .common ={
+        .tag =HARDWARE_MODULE_TAG,
+        .version_major =1,
+        .version_minor =0,
+        .id =SENSORS_HARDWARE_MODULE_ID,
+        .name ="CrosEC sensor hub module",
+        .author ="Google",
+        .methods =&cros_ec_sensors_methods,
+        .dso =NULL,
+        .reserved ={ 0 },
     },
-    get_sensors_list: cros_ec_get_sensors_list,
-    set_operation_mode: NULL,
+    .get_sensors_list =cros_ec_get_sensors_list,
+    .set_operation_mode =NULL,
 };
 
 /*****************************************************************************/
@@ -756,17 +758,17 @@ static int cros_ec_open_sensors(
         const struct hw_module_t* module, const char*,
         struct hw_device_t** device)
 {
-    char *ring_device_name, *ring_trigger_name;
+    char *ring_device_name = NULL, *ring_trigger_name = NULL;
     int err;
     err = cros_ec_get_sensors_names(&ring_device_name, &ring_trigger_name);
-    if (err < 0)
-        return err;
-
-    cros_ec_sensors_poll_context_t *dev = new cros_ec_sensors_poll_context_t(
-            module, ring_device_name, ring_trigger_name);
-
-    *device = &dev->device.common;
+    if (err == 0) {
+        cros_ec_sensors_poll_context_t *dev = new cros_ec_sensors_poll_context_t(
+                module, ring_device_name, ring_trigger_name);
 
-    return 0;
+        *device = &dev->device.common;
+    }
+    free(ring_device_name);
+    free(ring_trigger_name);
+    return err;
 }
 
diff --git a/sepolicy/cameraserver.te b/sepolicy/cameraserver.te
index 3bdd0cd..dcd5c79 100644
--- a/sepolicy/cameraserver.te
+++ b/sepolicy/cameraserver.te
@@ -14,4 +14,5 @@ allow cameraserver { proc proc_meminfo }:{ file lnk_file } r_file_perms;
 r_dir_file(cameraserver, sysfs)
 
 allow cameraserver system_file:dir r_dir_perms;
+allow cameraserver vendor_file_type:dir r_dir_perms;
 allow cameraserver tmpfs:dir search;
diff --git a/sepolicy/crash_collector.te b/sepolicy/crash_collector.te
index eab0428..3aa612b 100644
--- a/sepolicy/crash_collector.te
+++ b/sepolicy/crash_collector.te
@@ -6,6 +6,7 @@ type crash_reports_data_file, file_type, data_file_type;
 domain_auto_trans(kernel, crash_collector_exec, crash_collector)
 allow crash_collector kernel:fifo_file read;
 allow crash_collector crash_collector_exec:file execute_no_trans;
+allow crash_collector kernel:fd use;
 
 # To stop being root.
 allow crash_collector self:capability { setuid setgid };
diff --git a/sepolicy/crash_collector_app.te b/sepolicy/crash_collector_app.te
index 5759943..68a0b6d 100644
--- a/sepolicy/crash_collector_app.te
+++ b/sepolicy/crash_collector_app.te
@@ -6,4 +6,14 @@ net_domain(crash_collector_app)
 
 allow crash_collector_app crash_reports_data_file:file { read getattr };
 
-allow crash_collector_app { service_manager_type -gatekeeper_service -netd_service -dumpstate_service -installd_service}:service_manager find;
+allow crash_collector_app {
+  service_manager_type
+  -dumpstate_service
+  -gatekeeper_service
+  -installd_service
+  -incident_service
+  -netd_service
+  -virtual_touchpad_service
+  -vold_service
+  -vr_hwc_service
+}:service_manager find;
diff --git a/sepolicy/device_domain_deprecated.te b/sepolicy/device_domain_deprecated.te
index bbe0b71..0bfbe22 100644
--- a/sepolicy/device_domain_deprecated.te
+++ b/sepolicy/device_domain_deprecated.te
@@ -8,6 +8,9 @@ allow device_domain_deprecated device:file read;
 allow device_domain_deprecated system_file:dir r_dir_perms;
 allow device_domain_deprecated system_file:file r_file_perms;
 allow device_domain_deprecated system_file:lnk_file r_file_perms;
+allow device_domain_deprecated vendor_file_type:dir r_dir_perms;
+allow device_domain_deprecated vendor_file_type:file r_file_perms;
+allow device_domain_deprecated vendor_file_type:lnk_file r_file_perms;
 allow device_domain_deprecated system_data_file:file { getattr read };
 allow device_domain_deprecated system_data_file:lnk_file r_file_perms;
 allow device_domain_deprecated apk_data_file:dir { getattr search };
@@ -30,7 +33,5 @@ allow device_domain_deprecated cgroup:{ file lnk_file } r_file_perms;
 allow device_domain_deprecated proc_meminfo:file r_file_perms;
 allow device_domain_deprecated proc_net:dir r_dir_perms;
 allow device_domain_deprecated proc_net:{ file lnk_file } r_file_perms;
-allow device_domain_deprecated selinuxfs:dir r_dir_perms;
-allow device_domain_deprecated selinuxfs:file r_file_perms;
 allow device_domain_deprecated asec_public_file:file r_file_perms;
 allow device_domain_deprecated { asec_public_file asec_apk_file }:dir r_dir_perms;
diff --git a/sepolicy/domain.te b/sepolicy/domain.te
index bddbd2f..d09fe8d 100644
--- a/sepolicy/domain.te
+++ b/sepolicy/domain.te
@@ -1,2 +1,2 @@
 allow domain sysfs_socinfo:dir r_dir_perms;
-allow domain sysfs_socinfo:file r_file_perms;
+allow { domain -isolated_app } sysfs_socinfo:file r_file_perms;
diff --git a/sepolicy/dumpstate.te b/sepolicy/dumpstate.te
deleted file mode 100644
index b39a2f4..0000000
--- a/sepolicy/dumpstate.te
+++ /dev/null
@@ -1,16 +0,0 @@
-# dumpstate sets the debug.bq25892 property
-# to trigger the charger chip register dump as root by init
-set_prop(dumpstate, debug_bq25892_prop)
-
-# allow dumpstate to execute fwtool in its own domain
-allow dumpstate fwtool_exec:file rx_file_perms;
-
-# read /data/misc/fw_logs/bq25892.txt log file
-allow dumpstate fw_logs_data_file:file r_file_perms;
-allow dumpstate fw_logs_data_file:dir  r_dir_perms;
-
-# read /data/misc/touchfwup/rmi4update.txt log file
-allow dumpstate touch_fw_update_log_file:dir r_dir_perms;
-allow dumpstate touch_fw_update_log_file:file r_file_perms;
-
-allow dumpstate host1x_device:chr_file rw_file_perms;
diff --git a/sepolicy/file.te b/sepolicy/file.te
index 955f64f..41cb7c8 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -1,3 +1,6 @@
 # /sys/class/rfkill/rfkill0/state
 type sysfs_bluetooth, fs_type, sysfs_type;
 type sysfs_socinfo, sysfs_type, fs_type;
+
+type debugfs_ion, fs_type, debugfs_type;
+
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index c35cd0d..aae2af1 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -1,3 +1,6 @@
+# Debug files
+/sys/kernel/debug/ion/heaps/system  u:object_r:debugfs_ion:s0
+
 # block devices
 /dev/block/platform/700b0600\.sdhci/by-name/UDA       u:object_r:userdata_block_device:s0
 /dev/block/platform/700b0600\.sdhci/by-name/CAC       u:object_r:cache_block_device:s0
@@ -7,6 +10,7 @@
 /dev/block/platform/700b0600\.sdhci/by-name/recovery  u:object_r:recovery_block_device:s0
 /dev/block/platform/700b0600\.sdhci/by-name/KERN-A    u:object_r:boot_block_device:s0
 /dev/block/platform/700b0600\.sdhci/by-name/KERN-B    u:object_r:boot_block_device:s0
+/dev/block/platform/700b0600\.sdhci/by-name/MSC       u:object_r:misc_block_device:s0
 /dev/block/zram0                                      u:object_r:swap_block_device:s0
 /dev/block/mmcblk0rpmb                                u:object_r:rpmb_block_device:s0
 
@@ -34,6 +38,9 @@
 /system/bin/rmi4update                          u:object_r:rmi4update_exec:s0
 /system/bin/fwtool                              u:object_r:fwtool_exec:s0
 
+# vendor executables
+/vendor/bin/hw/android\.hardware\.dumpstate@1\.0-service.dragon      u:object_r:hal_dumpstate_impl_exec:s0
+
 # crash_collector
 /system/bin/crash_dispatcher                    u:object_r:crash_collector_exec:s0
 /system/bin/crash_collector32                   u:object_r:crash_collector_exec:s0
diff --git a/sepolicy/hal_dumpstate_impl.te b/sepolicy/hal_dumpstate_impl.te
new file mode 100644
index 0000000..61d1407
--- /dev/null
+++ b/sepolicy/hal_dumpstate_impl.te
@@ -0,0 +1,26 @@
+type hal_dumpstate_impl, domain;
+hal_server_domain(hal_dumpstate_impl, hal_dumpstate)
+
+type hal_dumpstate_impl_exec, exec_type, file_type;
+init_daemon_domain(hal_dumpstate_impl)
+
+# hal_dumstate_impl sets the debug.bq25892 property
+# to trigger the charger chip register dump as root by init
+set_prop(hal_dumpstate_impl, debug_bq25892_prop)
+
+# allow hal_dumstate_impl to execute fwtool in its own domain
+allow hal_dumpstate_impl fwtool_exec:file rx_file_perms;
+
+# read /data/misc/fw_logs/bq25892.txt log file
+allow hal_dumpstate_impl fw_logs_data_file:file r_file_perms;
+allow hal_dumpstate_impl fw_logs_data_file:dir  r_dir_perms;
+
+# read /data/misc/touchfwup/rmi4update.txt log file
+allow hal_dumpstate_impl touch_fw_update_log_file:dir r_dir_perms;
+allow hal_dumpstate_impl touch_fw_update_log_file:file r_file_perms;
+
+allow hal_dumpstate_impl host1x_device:chr_file rw_file_perms;
+
+allow hal_dumpstate_impl debugfs_ion:file r_file_perms;
+allow hal_dumpstate_impl shell_data_file:file getattr;
+allow hal_dumpstate_impl sysfs:file { getattr open read };
diff --git a/sepolicy/mediacodec.te b/sepolicy/mediacodec.te
index 654d832..7c49f44 100644
--- a/sepolicy/mediacodec.te
+++ b/sepolicy/mediacodec.te
@@ -1,4 +1,5 @@
 allow mediacodec sysfs:file r_file_perms;
 allow mediacodec system_file:dir r_dir_perms;
+allow mediacodec vendor_file_type:dir r_dir_perms;
 allow mediacodec device:dir r_dir_perms;
 allow mediacodec host1x_device:chr_file rw_file_perms;