Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1