Merge "Don't enable jdwp by default on userdebug builds"