Merge "Update ADB icon for Android T." into tm-dev