Merge "Fix ' escaping in adb."