Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1