Merge "Adding adb_debug.prop into debug ramdisk"
am: 2ddb8df2ef

Change-Id: I0a2a232b4dbd980172edf393048ae3b3eb80ffae