Merge "Add android: to text constant to prevent namespace conflicts." into sc-dev