Merge "Bring back nyandroid ADB icon."