Merge "Move SettingsLib icons to android."