Merge "Fix denial of /debug_ramdisk/adb_debug.prop"