Merge "Revert "Remove automatic adding of adb into default.prop""