Merge "Adding adb_debug.prop into generic_ramdisk.mk"