Merge "DO NOT MERGE - Updated ADB icon" into gingerbread