Merge "ndk: Show DeviceChooserDialog only when necessary."