[automerger skipped] Merge "Adding adb_debug.prop into debug ramdisk" into qt-dev
am: 347f1ccf4b -s ours
am skip reason: change_id Id6962414197fc8f47f7c07818e8fb16107dc17a3 with SHA1 6386c3207b is in history

Change-Id: I0c6f4a3c556c7af0c014a3edfcc39552d38992f8