Merge "Adding adb_debug.prop into debug ramdisk" into qt-dev